merging branches

120 files changed, 2548 insertions, 635 deletions

diff --git a/libre/xtensa-unknown-elf-binutils/PKGBUILD b/cross/xtensa-unknown-elf-binutils/PKGBUILD
index deb8d4b0e..072e5e50d 100644
--- a/libre/xtensa-unknown-elf-binutils/PKGBUILD
+++ b/cross/xtensa-unknown-elf-binutils/PKGBUILD
@@ -6,9 +6,9 @@
 _pkgname=binutils
 _target="xtensa-unknown-elf"
 
-pkgname=${_target}-binutils
+pkgname=${_target}-${_pkgname}
 pkgver=2.23.2
-pkgrel=2.4
+pkgrel=2.5
 pkgdesc="A set of programs to assemble and manipulate binary and object files for the Xtensa architecture"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/binutils/"
@@ -18,9 +18,11 @@ depends=('glibc>=2.17' 'zlib')
 options=('!libtool' '!distcc' '!ccache')
 install=${_target}-binutils.install
 source=(ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.bz2{,.sig}
+        https://raw.github.com/qca/open-ath9k-htc-firmware/1.3.2/local/patches/binutils.patch
         binutils-2.23.2-texinfo-5.0.patch)
 md5sums=('4f8fa651e35ef262edc01d60fb45702e'
          'dfde4428f08d91f309cdcfe92bf28d08'
+         '7077126d96e9a755a0eaddb5505efe68'
          '34e439ce23213a91e2af872dfbb5094c')
 
 prepare() {
@@ -30,6 +32,9 @@ prepare() {
   # http://sourceware.org/git/?p=binutils.git;a=patch;h=935f8542
   patch -p1 -i ${srcdir}/binutils-2.23.2-texinfo-5.0.patch
 
+  # open-ath9k-htc-firmware patch
+  patch -p1 -i ${srcdir}/binutils.patch
+
   # hack! - libiberty configure tests for header files using "$CPP $CPPFLAGS"
   sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure
 
diff --git a/libre/xtensa-unknown-elf-binutils/binutils-2.23.2-texinfo-5.0.patch b/cross/xtensa-unknown-elf-binutils/binutils-2.23.2-texinfo-5.0.patch
index 38dc19fb0..38dc19fb0 100644
--- a/libre/xtensa-unknown-elf-binutils/binutils-2.23.2-texinfo-5.0.patch
+++ b/cross/xtensa-unknown-elf-binutils/binutils-2.23.2-texinfo-5.0.patch
diff --git a/libre/xtensa-unknown-elf-binutils/xtensa-unknown-elf-binutils.install b/cross/xtensa-unknown-elf-binutils/xtensa-unknown-elf-binutils.install
index 9de0533ee..9de0533ee 100644
--- a/libre/xtensa-unknown-elf-binutils/xtensa-unknown-elf-binutils.install
+++ b/cross/xtensa-unknown-elf-binutils/xtensa-unknown-elf-binutils.install
diff --git a/libre/xtensa-unknown-elf-gcc/PKGBUILD b/cross/xtensa-unknown-elf-gcc/PKGBUILD
index 02611d173..76328723c 100644
--- a/libre/xtensa-unknown-elf-gcc/PKGBUILD
+++ b/cross/xtensa-unknown-elf-gcc/PKGBUILD
@@ -7,24 +7,30 @@ _pkgname=gcc
 _target="xtensa-unknown-elf"
 _sysroot="/usr/$CHOST/${_target}"
 
-pkgname=${_target}-gcc
+pkgname=${_target}-${_pkgname}
 pkgver=4.8.1
-pkgrel=1
+pkgrel=1.3
 pkgdesc="The GNU Compiler Collection for the Xtensa architecture"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL' 'custom')
 url="http://gcc.gnu.org"
-makedepends=('binutils>=2.23' 'libmpc' 'cloog' 'gcc-ada' 'doxygen')
+makedepends=("${_target}-binutils>=2.23" 'libmpc' 'cloog' 'gcc-ada' 'doxygen')
 checkdepends=('dejagnu' 'inetutils')
 options=('!libtool' '!emptydirs')
-source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2)
-md5sums=('3b2386c114cd74185aa3754b58a79304')
+source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
+        https://raw.github.com/qca/open-ath9k-htc-firmware/1.3.2/local/patches/gcc.patch)
+
+md5sums=('3b2386c114cd74185aa3754b58a79304'
+         '81372ee980289a9f6df01dad31c64a63')
 
 _basedir=gcc-${pkgver}
 
 prepare() {
   cd ${srcdir}/${_basedir}
 
+  # open-ath9k-htc-firmware patch
+  patch -p1 -i ${srcdir}/gcc.patch
+
   # Do not run fixincludes
   sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
 
@@ -69,10 +75,9 @@ build() {
   make all-gcc
 }
 
-package()
-{
+package() {
   pkgdesc="The GNU Compiler Collection for the Xtensa architecture"
-  depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.23' 'libmpc' 'cloog')
+  depends=("${_target}-binutils>=2.23" 'libmpc' 'cloog')
   groups=("${_target}-devel")
   install=${_target}-gcc.install
 
diff --git a/libre/xtensa-unknown-elf-gcc/xtensa-unknown-elf-gcc.install b/cross/xtensa-unknown-elf-gcc/xtensa-unknown-elf-gcc.install
index 3407a5e1f..3407a5e1f 100644
--- a/libre/xtensa-unknown-elf-gcc/xtensa-unknown-elf-gcc.install
+++ b/cross/xtensa-unknown-elf-gcc/xtensa-unknown-elf-gcc.install
diff --git a/libre/xtensa-unknown-elf-linux-libre-api-headers/PKGBUILD b/cross/xtensa-unknown-elf-linux-libre-api-headers/PKGBUILD
index 23dada50b..5885001c0 100644
--- a/libre/xtensa-unknown-elf-linux-libre-api-headers/PKGBUILD
+++ b/cross/xtensa-unknown-elf-linux-libre-api-headers/PKGBUILD
@@ -5,14 +5,14 @@
 # toolchain build order: linux-libre-api-headers->glibc->binutils->gcc->binutils->glibc
 export ARCH=xtensa
 _target=xtensa-unknown-elf
-_sysroot="usr/$CHOST/${_target}"
+_sysroot="/usr/${_target}"
 
 pkgname=${_target}-linux-libre-api-headers
 _basekernel=3.8
 _sublevel=4
 pkgver=${_basekernel}.${_sublevel}
-pkgrel=1
-pkgdesc="Kernel headers sanitized for use in userspace for Xtensa processors"
+pkgrel=1.3
+pkgdesc="Kernel headers sanitized for use in userspace for the Xtensa architecture"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/libc"
 license=('GPL2')
@@ -37,10 +37,10 @@ build() {
 
 package() {
   cd ${srcdir}/linux-${_basekernel}
-  make ARCH=${ARCH} INSTALL_HDR_PATH=${pkgdir}/${_sysroot} headers_install
+  make ARCH=${ARCH} INSTALL_HDR_PATH=${pkgdir} headers_install
 
   # use headers from libdrm
-  rm -r ${pkgdir}/${_sysroot}/include/drm
+  rm -r ${pkgdir}/include/drm
 
   # clean-up unnecessary files generated during install
   find ${pkgdir} \( -name .install -o -name ..install.cmd \) -delete
diff --git a/libre/angband-libre/PKGBUILD b/libre/angband-libre/PKGBUILD
new file mode 100644
index 000000000..21bde2beb
--- /dev/null
+++ b/libre/angband-libre/PKGBUILD
@@ -0,0 +1,56 @@
+# Maintainer: Israfel <israfel@lavabit.com>
+# Original Maintainer: schuay <jakob.gruber@gmail.com>
+# Original Maintainer: Mike Sampson <mike at sambodata dot com>
+# Contributor: Adrian Stratulat <adrian.stratulat at inboxcom>
+# Contributor: Anton Bazhenov <anton.bazhenov at gmail>
+# Contributor: KillaB <xGenoBlast@gmail.com>
+# Contributor: Callan Barrett <wizzomafizzo@gmail.com>
+# Contributor: Christian Schmidt <xmucknertx@googlemail.com>
+# Contributor: Sebastian Sareyko <public@nooms.de>
+
+_pkgname=angband
+pkgname=angband-libre
+pkgver=3.4.1
+pkgrel=1
+pkgdesc="A roguelike dungeon exploration game based on the writings of JRR Tolkien, without nonfree sound effects"
+arch=('i686' 'x86_64')
+url="http://rephial.org/"
+license=('GPL2' 'custom')
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
+depends=('sdl_image' 'sdl_ttf' 'sdl_mixer' 'ncurses' 'libglade')
+source=("http://rephial.org/downloads/${pkgver:0:3}/angband-v${pkgver}.tar.gz" "sound.patch")
+
+build() {
+
+  cd "${srcdir}/angband-v${pkgver}"
+  
+  patch -Np1 -i ../sound.patch
+
+  ./configure \
+    --prefix=/usr \
+    --bindir=/usr/bin \
+    --sysconfdir=/usr/share/angband \
+    --with-configpath=/usr/share/angband \
+    --with-libpath=/usr/share/angband \
+    --enable-gtk \
+    --enable-sdl \
+    --enable-sdl-mixer
+
+  make
+
+}
+
+package() {
+
+  cd "${srcdir}/angband-v${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+
+  rm -f "${pkgdir}/usr/share/angband/*/delete.me"
+  install -Dm644 copying.txt "${pkgdir}/usr/share/licenses/angband/COPYING"
+
+}
+sha512sums=('76099c8fa999e88ea1324bb70b4dee5df1faccd1fa256cc0c460ce2c5ddae9634fdef876bd0d826e99e6dcc54a9f9cf619d82552dc658d0115b97e0e644c19d3'
+            'fb3795f7ef5a266e36ef51c9275e65613eeba04fc4283646f21e77ca571b1562c1ad9a11782fe8f1052cefc48b0f3fa1f162bfff88fe8cf62c39e142878d3251')
diff --git a/libre/angband-libre/sound.patch b/libre/angband-libre/sound.patch
new file mode 100644
index 000000000..e70373b72
--- /dev/null
+++ b/libre/angband-libre/sound.patch
@@ -0,0 +1,154 @@
+# Removes nonfree sounds
+# Made by Israfel <israfel@lavabit.com>
+diff -Nur angband-v3.4.1/copying.txt angband-v3.4.1-libre/copying.txt
+--- angband-v3.4.1/copying.txt	2012-10-19 15:47:23.000000000 -0400
++++ angband-v3.4.1-libre/copying.txt	2013-06-29 20:07:03.250510548 -0400
+@@ -27,8 +27,6 @@
+    of this file.  Currently some of the tiles in the 64x64.png tilesheet were
+    resized from tiles made by David Gervais for the 32x32 set.
+ 
+- * the sounds are freeware, whatever that means.
+-
+  * The font files are all by Leon Marrick and/or Sheldon Simms III and/or Nick
+    McConnell, all of whom have agreed to their Angband work being released
+    under the GPL.
+Binary files angband-v3.4.1/lib/xtra/sound/breath.wav and angband-v3.4.1-libre/lib/xtra/sound/breath.wav differ
+Binary files angband-v3.4.1/lib/xtra/sound/clunk.wav and angband-v3.4.1-libre/lib/xtra/sound/clunk.wav differ
+Binary files angband-v3.4.1/lib/xtra/sound/death.wav and angband-v3.4.1-libre/lib/xtra/sound/death.wav differ
+Binary files angband-v3.4.1/lib/xtra/sound/destroy.wav and angband-v3.4.1-libre/lib/xtra/sound/destroy.wav differ
+Binary files angband-v3.4.1/lib/xtra/sound/drop.wav and angband-v3.4.1-libre/lib/xtra/sound/drop.wav differ
+Binary files angband-v3.4.1/lib/xtra/sound/eat.wav and angband-v3.4.1-libre/lib/xtra/sound/eat.wav differ
+Binary files angband-v3.4.1/lib/xtra/sound/flee.wav and angband-v3.4.1-libre/lib/xtra/sound/flee.wav differ
+Binary files angband-v3.4.1/lib/xtra/sound/hallu.wav and angband-v3.4.1-libre/lib/xtra/sound/hallu.wav differ
+Binary files angband-v3.4.1/lib/xtra/sound/hit1.wav and angband-v3.4.1-libre/lib/xtra/sound/hit1.wav differ
+Binary files angband-v3.4.1/lib/xtra/sound/hit.wav and angband-v3.4.1-libre/lib/xtra/sound/hit.wav differ
+Binary files angband-v3.4.1/lib/xtra/sound/kill1.wav and angband-v3.4.1-libre/lib/xtra/sound/kill1.wav differ
+Binary files angband-v3.4.1/lib/xtra/sound/kill.wav and angband-v3.4.1-libre/lib/xtra/sound/kill.wav differ
+Binary files angband-v3.4.1/lib/xtra/sound/level.wav and angband-v3.4.1-libre/lib/xtra/sound/level.wav differ
+diff -Nur angband-v3.4.1/lib/xtra/sound/Makefile angband-v3.4.1-libre/lib/xtra/sound/Makefile
+--- angband-v3.4.1/lib/xtra/sound/Makefile	2012-10-19 15:47:23.000000000 -0400
++++ angband-v3.4.1-libre/lib/xtra/sound/Makefile	2013-06-29 20:05:33.734131933 -0400
+@@ -1,9 +1,6 @@
+ MKPATH=../../../mk/
+ include $(MKPATH)buildsys.mk
+ 
+-DATA = sound.cfg breath.wav clunk.wav death.wav destroy.wav drop.wav eat.wav \
+-       flee.wav hallu.wav hit.wav hit1.wav kill.wav kill1.wav level.wav \
+-       miss.wav miss1.wav money.wav opendoor.wav shutdoor.wav thump.wav \
+-       vomit.wav
++DATA = sound.cfg
+ PACKAGE = xtra/sound
+ 
+Binary files angband-v3.4.1/lib/xtra/sound/miss1.wav and angband-v3.4.1-libre/lib/xtra/sound/miss1.wav differ
+Binary files angband-v3.4.1/lib/xtra/sound/miss.wav and angband-v3.4.1-libre/lib/xtra/sound/miss.wav differ
+Binary files angband-v3.4.1/lib/xtra/sound/money.wav and angband-v3.4.1-libre/lib/xtra/sound/money.wav differ
+Binary files angband-v3.4.1/lib/xtra/sound/opendoor.wav and angband-v3.4.1-libre/lib/xtra/sound/opendoor.wav differ
+Binary files angband-v3.4.1/lib/xtra/sound/shutdoor.wav and angband-v3.4.1-libre/lib/xtra/sound/shutdoor.wav differ
+diff -Nur angband-v3.4.1/lib/xtra/sound/sound.cfg angband-v3.4.1-libre/lib/xtra/sound/sound.cfg
+--- angband-v3.4.1/lib/xtra/sound/sound.cfg	2012-10-19 15:47:23.000000000 -0400
++++ angband-v3.4.1-libre/lib/xtra/sound/sound.cfg	2013-06-29 20:06:41.344730009 -0400
+@@ -41,19 +41,19 @@
+ #
+ 
+ # The shopkeep bought a worthless item.
+-store1 = money.wav
++store1 =
+ 
+ # The shopkeep paid too much for an item.
+-store2 = money.wav
++store2 =
+ 
+ # The shopkeep got away with a good bargain.
+-store3 = money.wav
++store3 =
+ 
+ # The shopkeep got away with a great bargain.
+-store4 = money.wav
++store4 =
+ 
+ # You make a normal transaction (buying or selling).
+-store5 = money.wav
++store5 =
+ 
+ # You enter a store.
+ store_enter =
+@@ -69,7 +69,7 @@
+ #
+ 
+ # You succeed in a melee attack against a monster.
+-hit = hit.wav drop.wav hit1.wav
++hit =
+ 
+ # It was a good hit!
+ hit_good =
+@@ -87,7 +87,7 @@
+ hit_hi_superb =
+ 
+ # You miss a melee attack against a monster.
+-miss = miss.wav miss1.wav
++miss =
+ 
+ # You fire a missile.
+ shoot =
+@@ -99,7 +99,7 @@
+ hitpoint_warn =
+ 
+ # You die.
+-death = death.wav
++death =
+ 
+ #
+ # Player sounds - status changes
+@@ -200,10 +200,10 @@
+ money3 =
+ 
+ # You (or a monster) drop something on the ground.
+-drop = clunk.wav
++drop =
+ 
+ # You gain (or regain) a level.
+-level = level.wav
++level =
+ 
+ # You successfully study a spell or prayer.
+ study =
+@@ -227,19 +227,19 @@
+ hitwall =
+ 
+ # You eat something.
+-eat = eat.wav
++eat =
+ 
+ # You successfully dig through something.
+-dig = thump.wav
++dig =
+ 
+ # You open a door.
+-opendoor = opendoor.wav
++opendoor =
+ 
+ # You shut a door.
+-shutdoor = shutdoor.wav
++shutdoor =
+ 
+ # You teleport from a level (including via recall).
+-tplevel = teleport.wav
++tplevel =
+ 
+ # Default "bell" sound for system messages.
+ bell =
+@@ -294,10 +294,10 @@
+ #
+ 
+ # A monster flees in terror.
+-flee = flee.wav
++flee =
+ 
+ # A monster is killed.
+-kill = kill.wav destroy.wav kill1.wav
++kill =
+ 
+ # A unique is killed.
+ kill_unique =
+Binary files angband-v3.4.1/lib/xtra/sound/thump.wav and angband-v3.4.1-libre/lib/xtra/sound/thump.wav differ
+Binary files angband-v3.4.1/lib/xtra/sound/vomit.wav and angband-v3.4.1-libre/lib/xtra/sound/vomit.wav differ
diff --git a/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins-libre/PKGBUILD
index ee0744317..00398bb39 100644
--- a/libre/audacious-plugins-libre/PKGBUILD
+++ b/libre/audacious-plugins-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 189208 2013-06-29 12:06:26Z bisson $
+# $Id: PKGBUILD 189804 2013-07-08 12:09:48Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: William Rea <sillywilly@gmail.com>
@@ -9,7 +9,7 @@
 _pkgname=audacious-plugins
 pkgname=audacious-plugins-libre
 pkgver=3.4
-pkgrel=1
+pkgrel=2
 pkgdesc='Plugins for Audacious, without nonfree plugins'
 url='http://audacious-media-player.org/'
 license=('GPL' 'GPL3' 'LGPL' 'custom:BSD')
@@ -30,7 +30,7 @@ provides=$_pkgname=$pkgver
 
 makedepends=("audacious>=${pkgver}"
              'oss-libre' 'alsa-lib' 'pulseaudio' 'jack2' 'lame' 'libvorbis' 'flac'
-             'mpg123' 'faad2' 'ffmpeg' 'libmodplug' 'fluidsynth' 'libcdio-paranoia' 'libsidplay' 'wavpack'
+             'mpg123' 'faad2' 'ffmpeg' 'libmodplug' 'fluidsynth' 'libcdio-paranoia' 'libsidplayfp' 'wavpack'
              'libnotify' 'lirc-utils-libre' 'curl' 'libmtp'
              'neon' 'libmms' 'libcue')
 
@@ -48,7 +48,7 @@ optdepends=('oss-libre: Open Sound System v4 output'
             'libmodplug: modplug input'
             'fluidsynth: MIDI FluidSynth backend input'
             'libcdio-paranoia: CD Digital Audio input'
-            'libsidplay: Commodore 64 audio input'
+            'libsidplayfp: Commodore 64 audio input'
             'wavpack: WavPack input'
 
             'libnotify: libnotify OSD'
@@ -108,7 +108,7 @@ prepare() {
 }
 
 build() {
-        cd "${srcdir}/${_pkgname}-${pkgver}"
+	cd "${srcdir}/${_pkgname}-${pkgver}"
 
 	./configure \
 		--prefix=/usr \
diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD
index bb17e745b..6921ab67c 100644
--- a/libre/cups-filters-libre/PKGBUILD
+++ b/libre/cups-filters-libre/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 188974 2013-06-27 14:08:06Z andyrtr $
+# $Id: PKGBUILD 189893 2013-07-10 19:19:27Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=cups-filters-libre
 _pkgname=cups-filters
 pkgver=1.0.35
-pkgrel=1
+pkgrel=2
 pkgdesc="OpenPrinting CUPS Filters, without foomatic-db-nonfree recommendation"
 arch=('i686' 'x86_64')
 url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting"
 license=('GPL')
-depends=('lcms2' 'poppler>=0.22.4' 'qpdf>=4.0.0')
+depends=('lcms2' 'poppler>=0.22.5' 'qpdf>=5.0.0')
 makedepends=('ghostscript' 'ttf-dejavu') # ttf-dejavu for make check
 optdepends=('ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images'
 	    'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly'
diff --git a/libre/epiphany-libre/PKGBUILD b/libre/epiphany-libre/PKGBUILD
new file mode 100644
index 000000000..d6a1c77b2
--- /dev/null
+++ b/libre/epiphany-libre/PKGBUILD
@@ -0,0 +1,56 @@
+# $Id: PKGBUILD 186904 2013-05-31 18:08:27Z heftig $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
+
+_pkgname=epiphany
+pkgname=epiphany-libre
+pkgver=3.8.2
+pkgrel=1
+install=epiphany.install
+pkgdesc="A GNOME web browser based on the WebKit rendering engine, with DuckDuckGo HTML support"
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL')
+depends=('libsoup' 'libnotify' 'gsettings-desktop-schemas' 'webkitgtk3' 'nss' 'iso-codes' 'dconf' 'desktop-file-utils'
+         'hicolor-icon-theme' 'gcr' 'gnome-desktop' 'libwnck3')
+makedepends=('intltool' 'gnome-doc-utils' 'startup-notification' 'gobject-introspection')
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
+options=('!libtool' '!emptydirs')
+groups=('gnome')
+url="http://www.gnome.org/projects/epiphany/"
+source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz)
+sha256sums=('ae89d6902ed243304d2cbf2fa361f6dd0cb3401fdaf726e6fdd4acc09197d50a')
+
+prepare() {
+  cd $_pkgname-$pkgver
+
+  # Replace Google support to DuckDuckGo HTML
+  sed -i 's|http://www[.]google[.]com/search?q=search[&]ie=UTF-8[&]oe=UTF-8|https://duckduckgo.com/html/?q=search|g' $(grep -rlI 'http://www[.]google[.]com/search?q=search&ie=UTF-8&oe=UTF-8')
+  sed -i 's|http://www[.]google[.]com/search?q=lala%2Elala[&]ie=UTF-8[&]oe=UTF-8|https://duckduckgo.com/html/?q=lala.lala|g' $(grep -rlI 'http://www[.]google[.]com/search?q=lala%2Elala&ie=UTF-8&oe=UTF-8')
+  sed -i 's|http://www[.]google[.]com/search?q=totalgarbage0xdeadbeef[&]ie=UTF-8[&]oe=UTF-8|https://duckduckgo.com/html/?q=totalgarbage0xdeadbeef|g' $(grep -rlI 'http://www[.]google[.]com/search?q=totalgarbage0xdeadbeef&ie=UTF-8&oe=UTF-8')
+  sed -i 's|http://www[.]google[.]com/search?q=search+separated+words+please[&]ie=UTF-8[&]oe=UTF-8|https://duckduckgo.com/html/?q=search+separated+words+please|g' $(grep -rlI 'http://www[.]google[.]com/search?q=search+separated+words+please&ie=UTF-8&oe=UTF-8')
+  sed -i '\|a quoted string should be searched|d' $(grep -rlI 'a quoted string should be searched')
+  sed -i 's|http://www[.]google[.]com/search?q=%s[&]amp;ie=UTF-8[&]amp;oe=UTF-8|https://duckduckgo.com/html/?q=%s|g' $(grep -rlI 'http://www[.]google[.]com/search')
+  sed -i 's|http://www[.]google[.]com|https://duckduckgo.com/html|g' $(grep -rlI 'google[.]com')
+  sed -i 's|http://google[.]com|https://duckduckgo.com/html|g' $(grep -rlI 'google[.]com')
+  sed -i 's|mail[.]google[.]com|mail.com|g' $(grep -rlI 'mail[.]google[.]com')
+  sed -i 's|google[.]com|duckduckgo.com/html|g' $(grep -rlI 'google[.]com')
+}
+
+build() {
+  cd $_pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+  make
+}
+
+package() {
+  cd $_pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/libre/epiphany-libre/epiphany.install b/libre/epiphany-libre/epiphany.install
new file mode 100644
index 000000000..8b17fa3d4
--- /dev/null
+++ b/libre/epiphany-libre/epiphany.install
@@ -0,0 +1,13 @@
+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
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/libre/mc-libre/PKGBUILD b/libre/mc-libre/PKGBUILD
index d286f9cf3..7ae51945f 100644
--- a/libre/mc-libre/PKGBUILD
+++ b/libre/mc-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 87679 2013-04-05 09:08:28Z schuay $
+# $Id: PKGBUILD 93857 2013-07-11 13:35:59Z schuay $
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Maintainer: schuay <jakob.gruber@gmail.com>
 
 _pkgname=mc
 pkgname=mc-libre
-pkgver=4.8.8
+pkgver=4.8.9
 pkgrel=1
 pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander, with unar and arj recommendation included and nonfree unace recommendation removed"
 arch=('i686' 'x86_64')
@@ -69,4 +69,4 @@ package() {
         -i "${pkgdir}/usr/lib/mc/extfs.d/s3+"
 }
 
-md5sums=('324ff5a192d30d3a3b234c130550eb0a')
+md5sums=('e701cc5ced4beed38e1977eba26dad50')
diff --git a/libre/parabola-keyring/PKGBUILD b/libre/parabola-keyring/PKGBUILD
index af130b5c0..212c3beb0 100644
--- a/libre/parabola-keyring/PKGBUILD
+++ b/libre/parabola-keyring/PKGBUILD
@@ -1,18 +1,19 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
 pkgname=parabola-keyring
-pkgver=$(LC_ALL=C date -u +%Y%m%d).1
+pkgver=$(LC_ALL=C date -u +%Y%m%d)
 pkgrel=1
 pkgdesc='Parabola GNU/Linux-libre PGP keyring'
 arch=('any')
 url='https://projects.parabolagnulinux.org/hackers.git/'
 license=('GPL')
 install="${pkgname}.install"
-source=(http://repo.parabolagnulinux.org/other/parabola-keyring-20130221.tar.gz{,.sig})
+source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz"
+        "http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz.sig")
 
 package() {
-	cd "${srcdir}/${pkgname}-"*
+	cd "${srcdir}/${pkgname}-${pkgver}"
 	make PREFIX=/usr DESTDIR=${pkgdir} install
 }
-md5sums=('007c35459478f86484f66323bf90b1e0'
+md5sums=('d876a03f772de98905fd7eadf0ad5e1c'
          'SKIP')
diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD
index a002aa3f7..f7c47e6a5 100644
--- a/libre/texlive-bin-libre/PKGBUILD
+++ b/libre/texlive-bin-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 185904 2013-05-19 18:27:14Z remy $
+# $Id: PKGBUILD 189858 2013-07-10 07:18:58Z bpiotrowski $
 # Maintainer: Rémy Oudompheng <remy@archlinux.org>
 # Contributor: francois <francois.archlinux.org>
 # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
@@ -6,7 +6,7 @@
 
 pkgname=texlive-bin-libre
 pkgver=2012.0
-pkgrel=12
+pkgrel=13
 pkgdesc="TeX Live binaries, without biber binaries (Parabola rebranded)"
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/libre/xtensa-unknown-elf-glibc/PKGBUILD b/libre/xtensa-unknown-elf-glibc/PKGBUILD
deleted file mode 100644
index 0a459b10b..000000000
--- a/libre/xtensa-unknown-elf-glibc/PKGBUILD
+++ /dev/null
@@ -1,155 +0,0 @@
-# $Id: PKGBUILD 186623 2013-05-30 07:47:03Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
-# NOTE: valgrind requires rebuilt with each major glibc version
-
-_pkgname=glibc
-_target="xtensa-unknown-elf"
-_sysroot="usr/$CHOST/${_target}"
-
-pkgname=${_target}-glibc
-pkgver=2.17
-pkgrel=6
-pkgdesc="GNU C Library for Xtensa processors"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/libc"
-license=('GPL' 'LGPL')
-groups=('base')
-depends=("${_target}-linux-api-headers>=3.7" 'tzdata' 'filesystem>=2013.01')
-makedepends=('gcc>=4.7')
-backup=(etc/gai.conf
-        etc/locale.gen
-        etc/nscd.conf)
-options=('!strip')
-install=${_target}-glibc.install
-source=(http://ftp.gnu.org/gnu/libc/${_pkgname}-${pkgver}.tar.xz{,.sig}
-        glibc-2.17-sync-with-linux37.patch
-        glibc-2.17-getaddrinfo-stack-overflow.patch
-        glibc-2.17-regexp-matcher-overrun.patch
-        nscd.service
-        nscd.tmpfiles
-        locale.gen.txt
-        locale-gen)
-md5sums=('87bf675c8ee523ebda4803e8e1cec638'
-         'SKIP'
-         'fb99380d94598cc76d793deebf630022'
-         '56d5f2c09503a348281a20ae404b7de3'
-         '200acc05961b084ee00dde919e64f82d'
-         'c1e07c0bec0fe89791bfd9d13fc85edf'
-         'bccbe5619e75cf1d97312ec3681c605c'
-         '07ac979b6ab5eeb778d55f041529d623'
-         '476e9113489f93b348b21e144b6a8fcf')
-
-
-build() {
-  cd ${srcdir}/${_pkgname}-${pkgver}
-
-  # combination of upstream commits 318cd0b, b540704 and fc1abbe
-  patch -p1 -i ${srcdir}/glibc-2.17-sync-with-linux37.patch
-
-  # CVE-2013-1914 - upstream commit 1cef1b19
-  patch -p1 -i ${srcdir}/glibc-2.17-getaddrinfo-stack-overflow.patch
-
-  # CVE-2013-0242 - upstream commit a445af0b
-  patch -p1 -i ${srcdir}/glibc-2.17-regexp-matcher-overrun.patch
-
-  cd ${srcdir}
-  mkdir glibc-build
-  cd glibc-build
-
-  if [[ ${CARCH} = "i686" ]]; then
-    # Hack to fix NPTL issues with Xen, only required on 32bit platforms
-    # TODO: make separate glibc-xen package for i686
-    export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs"
-  fi
-
-  echo "slibdir=/usr/lib" >> configparms
-  echo "sbindir=/usr/bin" >> configparms
-  echo "rootsbindir=/usr/bin" >> configparms
-
-  # remove hardening options for building libraries
-  CFLAGS=${CFLAGS/-fstack-protector/}
-  CPPFLAGS=${CPPFLAGS/-D_FORTIFY_SOURCE=2/}
-
-  ${srcdir}/${_pkgname}-${pkgver}/configure --prefix=/usr \
-      --libdir=/usr/lib --libexecdir=/usr/lib \
-      --build=$CHOST --host=$_target \
-      --with-headers=/${_sysroot}/include \
-      --with-bugurl=https://labs.parabola.nu/ \
-      --enable-add-ons=nptl,libidn \
-      --enable-obsolete-rpc \
-      --enable-kernel=2.6.32 \
-      --enable-bind-now --disable-profile \
-      --enable-stackguard-randomization \
-      --enable-multi-arch
-
-  # build libraries with hardening disabled
-  echo "build-programs=no" >> configparms
-  make
-  
-  # re-enable hardening for programs
-  sed -i "/build-programs=/s#no#yes#" configparms
-  echo "CC += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms
-  echo "CXX += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms
-  make
-
-  # remove harding in preparation to run test-suite
-  sed -i '4,6d' configparms
-}
-
-check() {
-  # bug to file - the linker commands need to be reordered
-  LDFLAGS=${LDFLAGS/--as-needed,/}
-
-  cd ${srcdir}/glibc-build
-  make check
-}
-
-package() {
-  cd ${srcdir}/glibc-build
-
-  install -dm755 ${pkgdir}/etc
-  touch ${pkgdir}/etc/ld.so.conf
-
-  make install_root=${pkgdir} install
-
-  rm -f ${pkgdir}/etc/ld.so.{cache,conf}
-
-  install -dm755 ${pkgdir}/usr/lib/{locale,systemd/system,tmpfiles.d}
-
-  install -m644 ${srcdir}/${_pkgname}-${pkgver}/nscd/nscd.conf ${pkgdir}/etc/nscd.conf
-  install -m644 ${srcdir}/nscd.service ${pkgdir}/usr/lib/systemd/system
-  install -m644 ${srcdir}/nscd.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/nscd.conf
-
-  install -m644 ${srcdir}/${_pkgname}-${pkgver}/posix/gai.conf ${pkgdir}/etc/gai.conf
-
-  install -m755 ${srcdir}/locale-gen ${pkgdir}/usr/bin
-
-  # create /etc/locale.gen
-  install -m644 ${srcdir}/locale.gen.txt ${pkgdir}/etc/locale.gen
-  sed -e '1,3d' -e 's|/| |g' -e 's|\\| |g' -e 's|^|#|g' \
-    ${srcdir}/glibc-${pkgver}/localedata/SUPPORTED >> ${pkgdir}/etc/locale.gen
-
-  # Do not strip the following files for improved debugging support
-  # ("improved" as in not breaking gdb and valgrind...):
-  #   ld-${pkgver}.so
-  #   libc-${pkgver}.so
-  #   libpthread-${pkgver}.so
-  #   libthread_db-1.0.so
-
-  cd $pkgdir
-  strip $STRIP_BINARIES usr/bin/{gencat,getconf,getent,iconv,iconvconfig} \
-                        usr/bin/{ldconfig,locale,localedef,nscd,makedb} \
-                        usr/bin/{pcprofiledump,pldd,rpcgen,sln,sprof} \
-                        usr/lib/getconf/*
-  [[ $CARCH = "i686" ]] && strip $STRIP_BINARIES usr/bin/lddlibc4
-
-  strip $STRIP_STATIC usr/lib/*.a
-
-  strip $STRIP_SHARED usr/lib/{libanl,libBrokenLocale,libcidn,libcrypt}-*.so \
-                      usr/lib/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-*.so \
-                      usr/lib/{libdl,libm,libnsl,libresolv,librt,libutil}-*.so \
-                      usr/lib/{libmemusage,libpcprofile,libSegFault}.so \
-                      usr/lib/{pt_chown,{audit,gconv}/*.so}
-}
diff --git a/libre/xtensa-unknown-elf-glibc/glibc-2.17-getaddrinfo-stack-overflow.patch b/libre/xtensa-unknown-elf-glibc/glibc-2.17-getaddrinfo-stack-overflow.patch
deleted file mode 100644
index aa916ac2c..000000000
--- a/libre/xtensa-unknown-elf-glibc/glibc-2.17-getaddrinfo-stack-overflow.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
-index d95c2d1..2309281 100644
---- a/sysdeps/posix/getaddrinfo.c
-+++ b/sysdeps/posix/getaddrinfo.c
-@@ -2489,11 +2489,27 @@ getaddrinfo (const char *name, const char *service,
-       __typeof (once) old_once = once;
-       __libc_once (once, gaiconf_init);
-       /* Sort results according to RFC 3484.  */
--      struct sort_result results[nresults];
--      size_t order[nresults];
-+      struct sort_result *results;
-+      size_t *order;
-       struct addrinfo *q;
-       struct addrinfo *last = NULL;
-       char *canonname = NULL;
-+      bool malloc_results;
-+
-+      malloc_results
-+	= !__libc_use_alloca (nresults * (sizeof (*results) + sizeof (size_t)));
-+      if (malloc_results)
-+	{
-+	  results = malloc (nresults * (sizeof (*results) + sizeof (size_t)));
-+	  if (results == NULL)
-+	    {
-+	      __free_in6ai (in6ai);
-+	      return EAI_MEMORY;
-+	    }
-+	}
-+      else
-+	results = alloca (nresults * (sizeof (*results) + sizeof (size_t)));
-+      order = (size_t *) (results + nresults);
- 
-       /* Now we definitely need the interface information.  */
-       if (! check_pf_called)
-@@ -2664,6 +2680,9 @@ getaddrinfo (const char *name, const char *service,
- 
-       /* Fill in the canonical name into the new first entry.  */
-       p->ai_canonname = canonname;
-+
-+      if (malloc_results)
-+	free (results);
-     }
- 
-   __free_in6ai (in6ai);
--- 
-1.7.1
-
diff --git a/libre/xtensa-unknown-elf-glibc/glibc-2.17-regexp-matcher-overrun.patch b/libre/xtensa-unknown-elf-glibc/glibc-2.17-regexp-matcher-overrun.patch
deleted file mode 100644
index b108f9d42..000000000
--- a/libre/xtensa-unknown-elf-glibc/glibc-2.17-regexp-matcher-overrun.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-diff --git a/posix/Makefile b/posix/Makefile
-index 88d409f..2cacd21 100644
---- a/posix/Makefile
-+++ b/posix/Makefile
-@@ -86,7 +86,7 @@ tests		:= tstgetopt testfnm runtests runptests	     \
- 		   tst-rfc3484-3 \
- 		   tst-getaddrinfo3 tst-fnmatch2 tst-cpucount tst-cpuset \
- 		   bug-getopt1 bug-getopt2 bug-getopt3 bug-getopt4 \
--		   bug-getopt5 tst-getopt_long1
-+		   bug-getopt5 tst-getopt_long1 bug-regex34
- xtests		:= bug-ga2
- ifeq (yes,$(build-shared))
- test-srcs	:= globtest
-@@ -199,5 +199,6 @@ bug-regex26-ENV = LOCPATH=$(common-objpfx)localedata
- bug-regex30-ENV = LOCPATH=$(common-objpfx)localedata
- bug-regex32-ENV = LOCPATH=$(common-objpfx)localedata
- bug-regex33-ENV = LOCPATH=$(common-objpfx)localedata
-+bug-regex34-ENV = LOCPATH=$(common-objpfx)localedata
- tst-rxspencer-ARGS = --utf8 rxspencer/tests
- tst-rxspencer-ENV = LOCPATH=$(common-objpfx)localedata
-diff --git a/posix/bug-regex34.c b/posix/bug-regex34.c
-new file mode 100644
-index 0000000..bb3b613
---- /dev/null
-+++ b/posix/bug-regex34.c
-@@ -0,0 +1,46 @@
-+/* Test re_search with multi-byte characters in UTF-8.
-+   Copyright (C) 2013 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, see
-+   <http://www.gnu.org/licenses/>.  */
-+
-+#define _GNU_SOURCE 1
-+#include <stdio.h>
-+#include <string.h>
-+#include <locale.h>
-+#include <regex.h>
-+
-+static int
-+do_test (void)
-+{
-+  struct re_pattern_buffer r;
-+  /* ကျွန်ုပ်x */
-+  const char *s = "\xe1\x80\x80\xe1\x80\xbb\xe1\x80\xbd\xe1\x80\x94\xe1\x80\xba\xe1\x80\xaf\xe1\x80\x95\xe1\x80\xbax";
-+
-+  if (setlocale (LC_ALL, "en_US.UTF-8") == NULL)
-+    {
-+      puts ("setlocale failed");
-+      return 1;
-+    }
-+  memset (&r, 0, sizeof (r));
-+
-+  re_compile_pattern ("[^x]x", 5, &r);
-+  /* This was triggering a buffer overflow.  */
-+  re_search (&r, s, strlen (s), 0, strlen (s), 0);
-+  return 0;
-+}
-+
-+#define TEST_FUNCTION do_test ()
-+#include "../test-skeleton.c"
-diff --git a/posix/regexec.c b/posix/regexec.c
-index 7f2de85..5ca2bf6 100644
---- a/posix/regexec.c
-+++ b/posix/regexec.c
-@@ -197,7 +197,7 @@ static int group_nodes_into_DFAstates (const re_dfa_t *dfa,
- static int check_node_accept (const re_match_context_t *mctx,
- 			      const re_token_t *node, int idx)
-      internal_function;
--static reg_errcode_t extend_buffers (re_match_context_t *mctx)
-+static reg_errcode_t extend_buffers (re_match_context_t *mctx, int min_len)
-      internal_function;
- 
- /* Entry point for POSIX code.  */
-@@ -1160,7 +1160,7 @@ check_matching (re_match_context_t *mctx, int fl_longest_match,
- 	  || (BE (next_char_idx >= mctx->input.valid_len, 0)
- 	      && mctx->input.valid_len < mctx->input.len))
- 	{
--	  err = extend_buffers (mctx);
-+	  err = extend_buffers (mctx, next_char_idx + 1);
- 	  if (BE (err != REG_NOERROR, 0))
- 	    {
- 	      assert (err == REG_ESPACE);
-@@ -1738,7 +1738,7 @@ clean_state_log_if_needed (re_match_context_t *mctx, int next_state_log_idx)
- 	  && mctx->input.valid_len < mctx->input.len))
-     {
-       reg_errcode_t err;
--      err = extend_buffers (mctx);
-+      err = extend_buffers (mctx, next_state_log_idx + 1);
-       if (BE (err != REG_NOERROR, 0))
- 	return err;
-     }
-@@ -2792,7 +2792,7 @@ get_subexp (re_match_context_t *mctx, int bkref_node, int bkref_str_idx)
- 		  if (bkref_str_off >= mctx->input.len)
- 		    break;
- 
--		  err = extend_buffers (mctx);
-+		  err = extend_buffers (mctx, bkref_str_off + 1);
- 		  if (BE (err != REG_NOERROR, 0))
- 		    return err;
- 
-@@ -4102,7 +4102,7 @@ check_node_accept (const re_match_context_t *mctx, const re_token_t *node,
- 
- static reg_errcode_t
- internal_function __attribute_warn_unused_result__
--extend_buffers (re_match_context_t *mctx)
-+extend_buffers (re_match_context_t *mctx, int min_len)
- {
-   reg_errcode_t ret;
-   re_string_t *pstr = &mctx->input;
-@@ -4111,8 +4111,10 @@ extend_buffers (re_match_context_t *mctx)
-   if (BE (INT_MAX / 2 / sizeof (re_dfastate_t *) <= pstr->bufs_len, 0))
-     return REG_ESPACE;
- 
--  /* Double the lengthes of the buffers.  */
--  ret = re_string_realloc_buffers (pstr, MIN (pstr->len, pstr->bufs_len * 2));
-+  /* Double the lengthes of the buffers, but allocate at least MIN_LEN.  */
-+  ret = re_string_realloc_buffers (pstr,
-+				   MAX (min_len,
-+					MIN (pstr->len, pstr->bufs_len * 2)));
-   if (BE (ret != REG_NOERROR, 0))
-     return ret;
- 
--- 
-1.7.1
-
diff --git a/libre/xtensa-unknown-elf-glibc/glibc-2.17-sync-with-linux37.patch b/libre/xtensa-unknown-elf-glibc/glibc-2.17-sync-with-linux37.patch
deleted file mode 100644
index 24b25c997..000000000
--- a/libre/xtensa-unknown-elf-glibc/glibc-2.17-sync-with-linux37.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-diff --git a/sysdeps/gnu/netinet/tcp.h b/sysdeps/gnu/netinet/tcp.h
-index 06e8414..b62a696 100644
---- a/sysdeps/gnu/netinet/tcp.h
-+++ b/sysdeps/gnu/netinet/tcp.h
-@@ -37,20 +37,29 @@
- /*
-  * User-settable options (used with setsockopt).
-  */
--#define	TCP_NODELAY	 1	/* Don't delay send to coalesce packets  */
--#define	TCP_MAXSEG	 2	/* Set maximum segment size  */
--#define TCP_CORK	 3	/* Control sending of partial frames  */
--#define TCP_KEEPIDLE	 4	/* Start keeplives after this period */
--#define TCP_KEEPINTVL	 5	/* Interval between keepalives */
--#define TCP_KEEPCNT	 6	/* Number of keepalives before death */
--#define TCP_SYNCNT	 7	/* Number of SYN retransmits */
--#define TCP_LINGER2	 8	/* Life time of orphaned FIN-WAIT-2 state */
--#define TCP_DEFER_ACCEPT 9	/* Wake up listener only when data arrive */
--#define TCP_WINDOW_CLAMP 10	/* Bound advertised window */
--#define TCP_INFO	 11	/* Information about this connection. */
--#define	TCP_QUICKACK	 12	/* Bock/reenable quick ACKs.  */
--#define TCP_CONGESTION	 13	/* Congestion control algorithm.  */
--#define TCP_MD5SIG	 14	/* TCP MD5 Signature (RFC2385) */
-+#define	TCP_NODELAY		 1  /* Don't delay send to coalesce packets  */
-+#define	TCP_MAXSEG		 2  /* Set maximum segment size  */
-+#define TCP_CORK		 3  /* Control sending of partial frames  */
-+#define TCP_KEEPIDLE		 4  /* Start keeplives after this period */
-+#define TCP_KEEPINTVL		 5  /* Interval between keepalives */
-+#define TCP_KEEPCNT		 6  /* Number of keepalives before death */
-+#define TCP_SYNCNT		 7  /* Number of SYN retransmits */
-+#define TCP_LINGER2		 8  /* Life time of orphaned FIN-WAIT-2 state */
-+#define TCP_DEFER_ACCEPT	 9  /* Wake up listener only when data arrive */
-+#define TCP_WINDOW_CLAMP	 10 /* Bound advertised window */
-+#define TCP_INFO		 11 /* Information about this connection. */
-+#define	TCP_QUICKACK		 12 /* Bock/reenable quick ACKs.  */
-+#define TCP_CONGESTION		 13 /* Congestion control algorithm.  */
-+#define TCP_MD5SIG		 14 /* TCP MD5 Signature (RFC2385) */
-+#define TCP_COOKIE_TRANSACTIONS	 15 /* TCP Cookie Transactions */
-+#define TCP_THIN_LINEAR_TIMEOUTS 16 /* Use linear timeouts for thin streams*/
-+#define TCP_THIN_DUPACK		 17 /* Fast retrans. after 1 dupack */
-+#define TCP_USER_TIMEOUT	 18 /* How long for loss retry before timeout */
-+#define TCP_REPAIR		 19 /* TCP sock is under repair right now */
-+#define TCP_REPAIR_QUEUE	 20 /* Set TCP queue to repair */
-+#define TCP_QUEUE_SEQ		 21 /* Set sequence number of repaired queue. */
-+#define TCP_REPAIR_OPTIONS	 22 /* Repair TCP connection options */
-+#define TCP_FASTOPEN		 23 /* Enable FastOpen on listeners */
- 
- #ifdef __USE_MISC
- # include <sys/types.h>
-@@ -173,7 +182,9 @@ enum
- # define TCPI_OPT_TIMESTAMPS	1
- # define TCPI_OPT_SACK		2
- # define TCPI_OPT_WSCALE	4
--# define TCPI_OPT_ECN		8
-+# define TCPI_OPT_ECN		8  /* ECN was negociated at TCP session init */
-+# define TCPI_OPT_ECN_SEEN	16 /* we received at least one packet with ECT */
-+# define TCPI_OPT_SYN_DATA	32 /* SYN-ACK acked data in SYN sent or rcvd */
- 
- /* Values for tcpi_state.  */
- enum tcp_ca_state
-@@ -241,6 +252,49 @@ struct tcp_md5sig
-   u_int8_t	tcpm_key[TCP_MD5SIG_MAXKEYLEN];	/* Key (binary).  */
- };
- 
-+/* For socket repair options.  */
-+struct tcp_repair_opt
-+{
-+  u_int32_t	opt_code;
-+  u_int32_t	opt_val;
-+};
-+
-+/* Queue to repair, for TCP_REPAIR_QUEUE.  */
-+enum
-+{
-+  TCP_NO_QUEUE,
-+  TCP_RECV_QUEUE,
-+  TCP_SEND_QUEUE,
-+  TCP_QUEUES_NR,
-+};
-+
-+/* For cookie transactions socket options.  */
-+#define TCP_COOKIE_MIN		8		/*  64-bits */
-+#define TCP_COOKIE_MAX		16		/* 128-bits */
-+#define TCP_COOKIE_PAIR_SIZE	(2*TCP_COOKIE_MAX)
-+
-+/* Flags for both getsockopt and setsockopt */
-+#define TCP_COOKIE_IN_ALWAYS	(1 << 0)	/* Discard SYN without cookie */
-+#define TCP_COOKIE_OUT_NEVER	(1 << 1)	/* Prohibit outgoing cookies,
-+						 * supercedes everything. */
-+
-+/* Flags for getsockopt */
-+#define TCP_S_DATA_IN		(1 << 2)	/* Was data received? */
-+#define TCP_S_DATA_OUT		(1 << 3)	/* Was data sent? */
-+
-+#define TCP_MSS_DEFAULT		 536U	/* IPv4 (RFC1122, RFC2581) */
-+#define TCP_MSS_DESIRED		1220U	/* IPv6 (tunneled), EDNS0 (RFC3226) */
-+
-+struct tcp_cookie_transactions
-+{
-+  u_int16_t	tcpct_flags;
-+  u_int8_t	__tcpct_pad1;
-+  u_int8_t	tcpct_cookie_desired;
-+  u_int16_t	tcpct_s_data_desired;
-+  u_int16_t	tcpct_used;
-+  u_int8_t	tcpct_value[TCP_MSS_DEFAULT];
-+};
-+
- #endif /* Misc.  */
- 
- #endif /* netinet/tcp.h */
-diff --git a/sysdeps/unix/sysv/linux/bits/socket.h b/sysdeps/unix/sysv/linux/bits/socket.h
-index df8f167..eadd7d9 100644
---- a/sysdeps/unix/sysv/linux/bits/socket.h
-+++ b/sysdeps/unix/sysv/linux/bits/socket.h
-@@ -1,6 +1,5 @@
- /* System-specific socket constants and types.  Linux version.
--   Copyright (C) 1991, 1992, 1994-2001, 2004, 2006-2010, 2011, 2012
--   Free Software Foundation, Inc.
-+   Copyright (C) 1991-2013 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-@@ -208,6 +207,8 @@ enum
- #define	MSG_MORE	MSG_MORE
-     MSG_WAITFORONE	= 0x10000, /* Wait for at least one packet to return.*/
- #define MSG_WAITFORONE	MSG_WAITFORONE
-+    MSG_FASTOPEN	= 0x20000000, /* Send data in TCP SYN.  */
-+#define MSG_FASTOPEN	MSG_FASTOPEN
- 
-     MSG_CMSG_CLOEXEC	= 0x40000000	/* Set close_on_exit for file
- 					   descriptor received through
diff --git a/libre/xtensa-unknown-elf-glibc/locale-gen b/libre/xtensa-unknown-elf-glibc/locale-gen
deleted file mode 100644
index 5aff344c4..000000000
--- a/libre/xtensa-unknown-elf-glibc/locale-gen
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-set -e
-
-LOCALEGEN=/etc/locale.gen
-LOCALES=/usr/share/i18n/locales
-if [ -n "$POSIXLY_CORRECT" ]; then
-  unset POSIXLY_CORRECT
-fi
-
-
-[ -f $LOCALEGEN -a -s $LOCALEGEN ] || exit 0;
-
-# Remove all old locale dir and locale-archive before generating new
-# locale data.
-rm -rf /usr/lib/locale/* || true
-
-umask 022
-
-is_entry_ok() {
-  if [ -n "$locale" -a -n "$charset" ] ; then
-    true
-  else
-    echo "error: Bad entry '$locale $charset'"
-    false
-  fi
-}
-
-echo "Generating locales..."
-while read locale charset; do \
-	case $locale in \#*) continue;; "") continue;; esac; \
-	is_entry_ok || continue
-	echo -n "  `echo $locale | sed 's/\([^.\@]*\).*/\1/'`"; \
-	echo -n ".$charset"; \
-	echo -n `echo $locale | sed 's/\([^\@]*\)\(\@.*\)*/\2/'`; \
-	echo -n '...'; \
-        if [ -f $LOCALES/$locale ]; then input=$locale; else \
-        input=`echo $locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; fi; \
-	localedef -i $input -c -f $charset -A /usr/share/locale/locale.alias $locale; \
-	echo ' done'; \
-done < $LOCALEGEN
-echo "Generation complete."
diff --git a/libre/xtensa-unknown-elf-glibc/locale.gen.txt b/libre/xtensa-unknown-elf-glibc/locale.gen.txt
deleted file mode 100644
index ccdd81734..000000000
--- a/libre/xtensa-unknown-elf-glibc/locale.gen.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-# Configuration file for locale-gen
-#
-# lists of locales that are to be generated by the locale-gen command.
-#
-# Each line is of the form:
-#
-#     <locale> <charset>
-#
-#  where <locale> is one of the locales given in /usr/share/i18n/locales
-#  and <charset> is one of the character sets listed in /usr/share/i18n/charmaps
-#
-#  Examples:
-#  en_US ISO-8859-1
-#  en_US.UTF-8 UTF-8
-#  de_DE ISO-8859-1
-#  de_DE@euro ISO-8859-15
-#
-#  The locale-gen command will generate all the locales,
-#  placing them in /usr/lib/locale.
-#
-#  A list of supported locales is included in this file.
-#  Uncomment the ones you need.
-#
diff --git a/libre/xtensa-unknown-elf-glibc/nscd.service b/libre/xtensa-unknown-elf-glibc/nscd.service
deleted file mode 100644
index bc80a0730..000000000
--- a/libre/xtensa-unknown-elf-glibc/nscd.service
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-Description=Name Service Cache Daemon
-After=syslog.target
- 
-[Service]
-Type=forking
-ExecStart=/usr/sbin/nscd
-ExecStop=/usr/sbin/nscd --shutdown
-ExecReload=/usr/sbin/nscd -i passwd
-ExecReload=/usr/sbin/nscd -i group
-ExecReload=/usr/sbin/nscd -i hosts
-ExecReload=/usr/sbin/nscd -i services
-Restart=always
-PIDFile=/run/nscd/nscd.pid
- 
-[Install]
-WantedBy=multi-user.target
diff --git a/libre/xtensa-unknown-elf-glibc/nscd.tmpfiles b/libre/xtensa-unknown-elf-glibc/nscd.tmpfiles
deleted file mode 100644
index 8a24a785e..000000000
--- a/libre/xtensa-unknown-elf-glibc/nscd.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-d /run/nscd 0755 root root
diff --git a/pcr/miniupnpd/PKGBUILD b/pcr/miniupnpd/PKGBUILD
index 57a04c290..da6f373c9 100644
--- a/pcr/miniupnpd/PKGBUILD
+++ b/pcr/miniupnpd/PKGBUILD
@@ -41,3 +41,5 @@ package() {
         cd "$pkgdir"
         mv usr/sbin usr/bin
 }
+md5sums=('484dbda7c428b2d5f3768500a48d3375'
+         'f862f79b673359adc80faf0be914394f')
diff --git a/pcr/nppangband-libre/PKGBUILD b/pcr/nppangband-libre/PKGBUILD
new file mode 100644
index 000000000..eeb59f6fc
--- /dev/null
+++ b/pcr/nppangband-libre/PKGBUILD
@@ -0,0 +1,33 @@
+# Maintainer: Israfel <israfel@lavabit.com>
+# Original PKGBUILD by James Rayner <iphitus@gmail.com> 
+# The Angband "adjust-sound-dir" patch by Chris Carr <rantingman@gmail.com> served as a reference for what files to edit for sound.patch
+
+_pkgname=nppangband
+pkgname=nppangband-libre
+pkgver=6.1.2
+pkgrel=1
+pkgdesc="A variant of Angband that attempts to take popular ideas from other variants, without nonfree sound effects"
+url="http://forum.nppangband.org/"
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname
+depends=('sdl' 'sdl_image' 'sdl_ttf' 'sdl_mixer' 'ncurses' 'libx11' 'freetype2')
+source=(http://download.nppangband.org/npp-6.1.2-src.zip sound.patch)
+license=('GPLv2 custom')
+arch=('i686' 'x86_64')
+
+build() {
+	cd $srcdir/npp-6.1.2-src/
+	patch -Np1 -i ../sound.patch
+	sh autogen.sh
+	./configure --enable-sdl
+	make
+}
+
+package() {  
+	cd $srcdir/npp-6.1.2-src/
+	make DESTDIR="$pkgdir/" install
+}
+
+sha512sums=('e12e05fd8944bb1d7e43b883416009a8e77198ee1ad0ea87480eaafb5f46ecdb218ef0b68876fb77cc2ab490a99f9b9303e02c7db385db6eb8d1d01a48cffdd0'
+            '820f4e678543b8f4d5092d6654bb3d4006e039fbc119d9ff5f468c01176497c25579ca2b0d6f6d302b11a3fbfaa6cfcdf89029ff586cda31d97e413cb8b91040')
diff --git a/pcr/nppangband-libre/sound.patch b/pcr/nppangband-libre/sound.patch
new file mode 100644
index 000000000..9de2b0177
--- /dev/null
+++ b/pcr/nppangband-libre/sound.patch
@@ -0,0 +1,241 @@
+# Made by Israfel <israfel@lavabit.com> for the Parabola GNU/Linux-Libre "nppangband-libre" package
+# The Angband "adjust-sound-dir" patch by Chris Carr <rantingman@gmail.com> served as a reference for what files to edit
+diff -crB npp-6.1.2-src/COPYING npp-6.1.2-src-libre/COPYING
+*** npp-6.1.2-src/COPYING	2013-03-29 14:37:32.000000000 -0400
+--- npp-6.1.2-src-libre/COPYING	2013-06-29 16:22:09.154804370 -0400
+***************
+*** 13,20 ****
+   * David Gervais' (32x32) graphics, including modifications and additional tiles by Jeff Greene, Thacker and Rob Fiala for NPPAngband may be redistributed, 
+  modified, and used only under the terms of the Creative Commons Attribution 3.0 licence: http://creativecommons.org/licenses/by/3.0/
+  
+-  * the sounds are freeware, whatever that means.
+- 
+   * the font files are under the licences noted in lib/xtra/font/copying.txt,
+     all of which are OSI-compliant.
+  
+--- 13,18 ----
+Only in npp-6.1.2-src/lib/xtra/sound: breath.wav
+Only in npp-6.1.2-src/lib/xtra/sound: clunk.wav
+Only in npp-6.1.2-src/lib/xtra/sound: death.wav
+Only in npp-6.1.2-src/lib/xtra/sound: destroy.wav
+Only in npp-6.1.2-src/lib/xtra/sound: drop.wav
+Only in npp-6.1.2-src/lib/xtra/sound: eat.wav
+Only in npp-6.1.2-src/lib/xtra/sound: flee.wav
+Only in npp-6.1.2-src/lib/xtra/sound: hallu.wav
+Only in npp-6.1.2-src/lib/xtra/sound: hit1.wav
+Only in npp-6.1.2-src/lib/xtra/sound: hit.wav
+Only in npp-6.1.2-src/lib/xtra/sound: kill1.wav
+Only in npp-6.1.2-src/lib/xtra/sound: kill.wav
+Only in npp-6.1.2-src/lib/xtra/sound: level.wav
+diff -crB npp-6.1.2-src/lib/xtra/sound/Makefile npp-6.1.2-src-libre/lib/xtra/sound/Makefile
+*** npp-6.1.2-src/lib/xtra/sound/Makefile	2013-03-29 14:37:36.000000000 -0400
+--- npp-6.1.2-src-libre/lib/xtra/sound/Makefile	2013-06-29 16:21:53.525414705 -0400
+***************
+*** 1,10 ****
+  MKPATH=../../../mk/
+  include $(MKPATH)buildsys.mk
+  
+! LIBDATA = sound.cfg breath.wav clunk.wav death.wav destroy.wav \
+! drop.wav eat.wav flee.wav hallu.wav hit.wav hit1.wav kill.wav \
+! kill1.wav level.wav miss.wav miss1.wav money.wav opendoor.wav \
+! shutdoor.wav thump.wav vomit.wav \
+  
+  PACKAGE = xtra/sound
+  
+--- 1,7 ----
+  MKPATH=../../../mk/
+  include $(MKPATH)buildsys.mk
+  
+! LIBDATA = sound.cfg
+  
+  PACKAGE = xtra/sound
+  
+Only in npp-6.1.2-src/lib/xtra/sound: miss1.wav
+Only in npp-6.1.2-src/lib/xtra/sound: miss.wav
+Only in npp-6.1.2-src/lib/xtra/sound: money.wav
+Only in npp-6.1.2-src/lib/xtra/sound: opendoor.wav
+Only in npp-6.1.2-src/lib/xtra/sound: shutdoor.wav
+diff -crB npp-6.1.2-src/lib/xtra/sound/sound.cfg npp-6.1.2-src-libre/lib/xtra/sound/sound.cfg
+*** npp-6.1.2-src/lib/xtra/sound/sound.cfg	2013-03-29 14:37:38.000000000 -0400
+--- npp-6.1.2-src-libre/lib/xtra/sound/sound.cfg	2013-06-29 16:20:47.241336459 -0400
+***************
+*** 41,59 ****
+  #
+  
+  # The shopkeep bought a worthless item.
+! store1 = money.wav
+  
+  # The shopkeep paid too much for an item.
+! store2 = money.wav
+  
+  # The shopkeep got away with a good bargain.
+! store3 = money.wav
+  
+  # The shopkeep got away with a great bargain.
+! store4 = money.wav
+  
+  # You make a normal transaction (buying or selling).
+! store5 = money.wav
+  
+  # You enter a store.
+  store_enter =
+--- 41,59 ----
+  #
+  
+  # The shopkeep bought a worthless item.
+! store1 =
+  
+  # The shopkeep paid too much for an item.
+! store2 =
+  
+  # The shopkeep got away with a good bargain.
+! store3 =
+  
+  # The shopkeep got away with a great bargain.
+! store4 =
+  
+  # You make a normal transaction (buying or selling).
+! store5 =
+  
+  # You enter a store.
+  store_enter =
+***************
+*** 69,75 ****
+  #
+  
+  # You succeed in a melee attack against a monster.
+! hit = hit.wav drop.wav hit1.wav
+  
+  # It was a good hit!
+  hit_good =
+--- 69,75 ----
+  #
+  
+  # You succeed in a melee attack against a monster.
+! hit =
+  
+  # It was a good hit!
+  hit_good =
+***************
+*** 87,93 ****
+  hit_hi_superb =
+  
+  # You miss a melee attack against a monster.
+! miss = miss.wav miss1.wav
+  
+  # You fire a missile.
+  shoot =
+--- 87,93 ----
+  hit_hi_superb =
+  
+  # You miss a melee attack against a monster.
+! miss =
+  
+  # You fire a missile.
+  shoot =
+***************
+*** 99,105 ****
+  hitpoint_warn =
+  
+  # You die.
+! death = death.wav
+  
+  #
+  # Player sounds - status changes
+--- 99,105 ----
+  hitpoint_warn =
+  
+  # You die.
+! death =
+  
+  #
+  # Player sounds - status changes
+***************
+*** 197,206 ****
+  money3 =
+  
+  # You (or a monster) drop something on the ground.
+! drop = clunk.wav
+  
+  # You gain (or regain) a level.
+! level = level.wav
+  
+  # You successfully study a spell or prayer.
+  study =
+--- 197,206 ----
+  money3 =
+  
+  # You (or a monster) drop something on the ground.
+! drop =
+  
+  # You gain (or regain) a level.
+! level =
+  
+  # You successfully study a spell or prayer.
+  study =
+***************
+*** 224,242 ****
+  hitwall =
+  
+  # You eat something.
+! eat = eat.wav
+  
+  # You successfully dig through something.
+! dig = thump.wav
+  
+  # You open a door.
+! opendoor = opendoor.wav
+  
+  # You shut a door.
+! shutdoor = shutdoor.wav
+  
+  # You teleport from a level (including via recall).
+! tplevel = teleport.wav
+  
+  # Default "bell" sound for system messages.
+  bell =
+--- 224,242 ----
+  hitwall =
+  
+  # You eat something.
+! eat =
+  
+  # You successfully dig through something.
+! dig =
+  
+  # You open a door.
+! opendoor =
+  
+  # You shut a door.
+! shutdoor =
+  
+  # You teleport from a level (including via recall).
+! tplevel =
+  
+  # Default "bell" sound for system messages.
+  bell =
+***************
+*** 291,300 ****
+  #
+  
+  # A monster flees in terror.
+! flee = flee.wav
+  
+  # A monster is killed.
+! kill = kill.wav destroy.wav kill1.wav
+  
+  # A unique is killed.
+  kill_unique =
+--- 291,300 ----
+  #
+  
+  # A monster flees in terror.
+! flee =
+  
+  # A monster is killed.
+! kill =
+  
+  # A unique is killed.
+  kill_unique =
+Only in npp-6.1.2-src/lib/xtra/sound: thump.wav
+Only in npp-6.1.2-src/lib/xtra/sound: vomit.wav
diff --git a/pcr/rfc5766-turn-server/PKGBUILD b/pcr/rfc5766-turn-server/PKGBUILD
index 81eb3d14d..e85f98bb8 100644
--- a/pcr/rfc5766-turn-server/PKGBUILD
+++ b/pcr/rfc5766-turn-server/PKGBUILD
@@ -3,20 +3,21 @@
 pkgname=rfc5766-turn-server
 _portname=turnserver
 pkgver=1.8.6.0
-pkgrel=1
+pkgrel=2
 epoch=
 pkgdesc="Free open source implementation of TURN and STUN Server"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/rfc5766-turn-server/"
 license=('custom:BSDNew')
-makedepends=('gcc>=3.4.4' 'make')
+makedepends=('gcc>=3.4.4' 'make' 'hiredis' 'postgresql-libs' 'libmariadbclient')
 depends=('libevent')
-#no redis headers in redi package
-optdepends=('postgresql-client: to use postgresql' 'libmysqlclient')
+optdepends=('postgresql-client: to use postgresql'
+            'mariadb: mariadb backend'
+            'redis: redis backend')
 backup=("etc/turnserver.conf" "etc/turnuserdb.conf")
 changelog=ChangeLog
-source=(https://${pkgname}.googlecode.com/files/${_portname}-$pkgver.tar.gz)
-sha1sums=('155990b95d399542db1bb497f1746c1b9bb290d2')
+source=(https://${pkgname}.googlecode.com/files/${_portname}-$pkgver.tar.gz
+        turn.service stun.service)
 
 build() {
   cd "${srcdir}/$_portname-${pkgver}"
@@ -51,11 +52,20 @@ package() {
     install
   
   
-  install -D "$pkgdir/usr/share/$pkgname/examples/etc/turnserver.conf" "$pkgdir/etc/turnserver.conf"
-  install -D "$pkgdir/usr/share/$pkgname/examples/etc/turnuserdb.conf" "$pkgdir/etc/turnuserdb.conf"
+  install -D "$pkgdir/usr/share/$pkgname/examples/etc/turnserver.conf" \
+             "$pkgdir/etc/turnserver.conf"
+  install -D "$pkgdir/usr/share/$pkgname/examples/etc/turnuserdb.conf" \
+             "$pkgdir/etc/turnuserdb.conf"
+  install -D "$srcdir/stun.service" \
+             "$pkgdir/usr/lib/systemd/system/stun.service"
+  install -D "$srcdir/turn.service" \
+             "$pkgdir/usr/lib/systemd/system/turn.service"
   rm -r "$pkgdir/usr/etc"
 
   chmod 644 "$pkgdir/usr/lib/libturnclient.a"
 
   install -Dm 644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }
+md5sums=('def4cc2ea6239795edab12b5eee5f8ed'
+         '1da26c3a1fe29a8961e6b9d73f9048d3'
+         '83670d79026c67c7701481ee9d39f100')
diff --git a/pcr/rfc5766-turn-server/stun.service b/pcr/rfc5766-turn-server/stun.service
new file mode 100644
index 000000000..bddb6168a
--- /dev/null
+++ b/pcr/rfc5766-turn-server/stun.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=STUN Server
+After=network.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/turnserver --stun-only
+
+[Install]
+WantedBy=multi-user.target
diff --git a/pcr/rfc5766-turn-server/turn.service b/pcr/rfc5766-turn-server/turn.service
new file mode 100644
index 000000000..54cc5f01a
--- /dev/null
+++ b/pcr/rfc5766-turn-server/turn.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=TURN Server
+After=network.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/turnserver
+
+[Install]
+WantedBy=multi-user.target
diff --git a/pcr/supermodel/PKGBUILD b/pcr/supermodel/PKGBUILD
new file mode 100644
index 000000000..fd22bea59
--- /dev/null
+++ b/pcr/supermodel/PKGBUILD
@@ -0,0 +1,38 @@
+# Maintainer: Anton Shestakov <engored*ya.ru>
+
+pkgname=supermodel
+pkgver=0.2a
+pkgrel=1
+pkgdesc='A Sega Model 3 Arcade Emulator'
+arch=('i686' 'x86_64')
+url='http://www.supermodel3.com/'
+license=('GPL3')
+depends=('mesa' 'glu' 'sdl' 'zlib')
+install=supermodel.install
+source=('multiuser.patch' 'supermodel.sh' 
+        "http://www.supermodel3.com/Files/Supermodel_${pkgver}_Src.zip")
+md5sums=('a7cf136e412a0d927b099c15793b658d' 'ea8274c2a37acddd026fce9c831530cc'
+        'd22359fbe277fe8f6fe0a06524350fc1')
+
+MAKEFLAGS="-j1"
+
+build() {
+  cd "$srcdir/Supermodel_${pkgver}_Src"
+  sed -e "s/-Wall -O3/$CFLAGS/" -i 'Makefiles/Makefile.SDL.UNIX.GCC'
+  patch -p1 < ../multiuser.patch
+  make -f 'Makefiles/Makefile.SDL.UNIX.GCC'
+}
+
+package() {
+  cd "$srcdir/Supermodel_${pkgver}_Src"
+
+  install -Dm755 "$srcdir/supermodel.sh" "$pkgdir/usr/bin/supermodel"
+
+  install -Dm755 "bin/Supermodel" "$pkgdir/usr/share/supermodel/Supermodel"
+
+  install -Dm644 "Docs/LICENSE.txt" "$pkgdir/usr/share/licenses/supermodel/LICENSE"
+  install -Dm644 "Docs/README.txt" "$pkgdir/usr/share/doc/supermodel/README"
+
+  install -d "$pkgdir/usr/share/supermodel/Config"
+  install -m644 Config/* "$pkgdir/usr/share/supermodel/Config/"
+}
diff --git a/pcr/supermodel/multiuser.patch b/pcr/supermodel/multiuser.patch
new file mode 100644
index 000000000..9cb93e02c
--- /dev/null
+++ b/pcr/supermodel/multiuser.patch
@@ -0,0 +1,107 @@
+diff --git a/Src/OSD/SDL/Main.cpp b/Src/OSD/SDL/Main.cpp
+--- a/Src/OSD/SDL/Main.cpp
++++ b/Src/OSD/SDL/Main.cpp
+@@ -307,7 +307,6 @@
+  Configuration file management and input settings.

+ ******************************************************************************/

+ 

+-#define CONFIG_FILE_PATH	"Config/Supermodel.ini"

+ #define CONFIG_FILE_COMMENT	";\n" \

+ 							"; Supermodel Configuration File\n" \

+ 							";\n"

+@@ -315,9 +314,13 @@
+ // Create and configure inputs

+ static bool ConfigureInputs(CInputs *Inputs, bool configure)

+ {

++	char		configFilePath[512];

++	

++	sprintf(configFilePath, "%s/.supermodel/supermodel.ini", getenv("HOME"));

++	

+ 	// Open and parse configuration file

+ 	CINIFile INI;

+-	INI.Open(CONFIG_FILE_PATH);	// doesn't matter if it exists or not, will get overwritten

++	INI.Open(configFilePath);	// doesn't matter if it exists or not, will get overwritten

+ 	INI.SetDefaultSectionName("Global");

+ 	INI.Parse();

+ 	

+@@ -338,9 +341,9 @@
+ 			Inputs->WriteToINIFile(&INI, "Global");

+ 		

+ 			if (OKAY != INI.Write(CONFIG_FILE_COMMENT))

+-				ErrorLog("Unable to save configuration to '%s'.", CONFIG_FILE_PATH);

++				ErrorLog("Unable to save configuration to '%s'.", configFilePath);

+ 			else

+-				printf("Configuration successfully saved to '%s'.\n", CONFIG_FILE_PATH);

++				printf("Configuration successfully saved to '%s'.\n", configFilePath);

+ 		}

+ 		else

+ 			puts("Configuration aborted...");

+@@ -412,9 +415,13 @@
+ // Read settings (from a specific section) from the config file

+ static void ReadConfigFile(const char *section)

+ {

++	char		configFilePath[512];

++	

++	sprintf(configFilePath, "%s/.supermodel/supermodel.ini", getenv("HOME"));

++	

+ 	CINIFile	INI;	

+ 	

+-	INI.Open(CONFIG_FILE_PATH);

++	INI.Open(configFilePath);

+ 	INI.SetDefaultSectionName("Global");	// required to read settings not associated with a specific section

+ 	INI.Parse();

+ 	ApplySettings(&INI, section);

+@@ -498,10 +505,10 @@
+ static void SaveState(CModel3 *Model3)

+ {

+ 	CBlockFile	SaveState;

+-	char		filePath[24];

++	char		filePath[512];

+ 	int			fileVersion = STATE_FILE_VERSION;

+ 	

+-	sprintf(filePath, "Saves/%s.st%d", Model3->GetGameInfo()->id, saveSlot);

++	sprintf(filePath, "%s/.supermodel/saves/%s.st%d", getenv("HOME"), Model3->GetGameInfo()->id, saveSlot);

+ 	if (OKAY != SaveState.Create(filePath, "Supermodel Save State", "Supermodel Version " SUPERMODEL_VERSION))

+ 	{

+ 		ErrorLog("Unable to save state to '%s'.", filePath);

+@@ -522,11 +529,11 @@
+ static void LoadState(CModel3 *Model3)

+ {

+ 	CBlockFile	SaveState;

+-	char		filePath[24];

++	char		filePath[512];

+ 	int			fileVersion;

+ 	

+ 	// Generate file path

+-	sprintf(filePath, "Saves/%s.st%d", Model3->GetGameInfo()->id, saveSlot);

++	sprintf(filePath, "%s/.supermodel/saves/%s.st%d", getenv("HOME"), Model3->GetGameInfo()->id, saveSlot);

+ 	

+ 	// Open and check to make sure format is correct

+ 	if (OKAY != SaveState.Load(filePath))

+@@ -558,10 +565,10 @@
+ static void SaveNVRAM(CModel3 *Model3)

+ {

+ 	CBlockFile	NVRAM;

+-	char		filePath[24];

++	char		filePath[512];

+ 	int			fileVersion = NVRAM_FILE_VERSION;

+ 	

+-	sprintf(filePath, "NVRAM/%s.nv", Model3->GetGameInfo()->id);

++	sprintf(filePath, "%s/.supermodel/NVRAM/%s.nv", getenv("HOME"), Model3->GetGameInfo()->id);

+ 	if (OKAY != NVRAM.Create(filePath, "Supermodel NVRAM State", "Supermodel Version " SUPERMODEL_VERSION))

+ 	{

+ 		ErrorLog("Unable to save NVRAM to '%s'. Make sure directory exists!", filePath);

+@@ -581,11 +588,11 @@
+ static void LoadNVRAM(CModel3 *Model3)

+ {

+ 	CBlockFile	NVRAM;

+-	char		filePath[24];

++	char		filePath[512];

+ 	int			fileVersion;

+ 	

+ 	// Generate file path

+-	sprintf(filePath, "NVRAM/%s.nv", Model3->GetGameInfo()->id);

++	sprintf(filePath, "%s/.supermodel/NVRAM/%s.nv", getenv("HOME"), Model3->GetGameInfo()->id);

+ 	

+ 	// Open and check to make sure format is correct

+ 	if (OKAY != NVRAM.Load(filePath))

diff --git a/pcr/supermodel/supermodel.install b/pcr/supermodel/supermodel.install
new file mode 100644
index 000000000..94ef82c48
--- /dev/null
+++ b/pcr/supermodel/supermodel.install
@@ -0,0 +1,12 @@
+# Message displayed for a fresh install.
+post_install() { 
+  echo ""
+  echo "***************************************************************"
+  echo " Supermodel has been installed in /usr/share/supermodel."
+  echo " However, Supermodel can be run by typing supermodel and it's options:"
+  echo " supermodel <romset> [options]"
+  echo ""
+  echo " Note: You need to provide the full path to the romset."
+  echo "***************************************************************"
+  echo ""
+}
diff --git a/pcr/supermodel/supermodel.sh b/pcr/supermodel/supermodel.sh
new file mode 100644
index 000000000..992dd406d
--- /dev/null
+++ b/pcr/supermodel/supermodel.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+mkdir -p ~/.supermodel/NVRAM
+mkdir -p ~/.supermodel/saves
+
+cd /usr/share/supermodel
+
+if [[ ! -f ~/.supermodel/supermodel.ini ]]; then
+    cp ./Config/Supermodel.ini ~/.supermodel/supermodel.ini
+fi
+
+./Supermodel "$@"
diff --git a/pcr/tinc-pre/PKGBUILD b/pcr/tinc-pre/PKGBUILD
new file mode 100644
index 000000000..ebbd4cc3f
--- /dev/null
+++ b/pcr/tinc-pre/PKGBUILD
@@ -0,0 +1,42 @@
+pkgname=tinc-pre
+pkgver=1.1pre7
+pkgrel=2
+pkgdesc="VPN (Virtual Private Network) daemon (Pre-release)"
+arch=(i686 x86_64)
+url="http://www.tinc-vpn.org/"
+license=('GPL')
+depends=('lzo2' 'zlib' 'openssl')
+optdepends=('wxpython: gui support')
+provides=('tinc-pre')
+conflicts=('tinc')
+source=(http://www.tinc-vpn.org/packages/tinc-$pkgver.tar.gz{,.sig}
+        tincd@.service)
+
+build() {
+  cd "$srcdir/tinc-$pkgver"
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin
+  make
+}
+
+package() {
+  cd "$srcdir/tinc-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+
+  install -dm755 "$pkgdir"/usr/share/tinc/examples
+  tar xozvf doc/sample-config.tar.gz -C $pkgdir/usr/share/tinc/examples
+  find "$pkgdir"/usr/share/tinc/examples -type f -exec chmod 644 {} +
+  find "$pkgdir"/usr/share/tinc/examples -type d -exec chmod 755 {} +
+
+  install -Dm644 "$srcdir/tincd@.service" \
+                 "$pkgdir/usr/lib/systemd/system/tincd@.service"
+
+  sed -e 's,#!/usr/bin/python,#!/usr/bin/python2,' \
+      -i $pkgdir/usr/bin/tinc-gui
+}
+sha1sums=('62a014356864c3a5204edd6e934f3ee575760cfc'
+          'SKIP'
+          '6ab485732bb6c59e7e0e162f22251a0f554ec69c')
+sha256sums=('ff330627ad0d6ce1233408bb75b11d7506be13eb0c802ff1657866d97545074b'
+            'SKIP'
+            '43d086b76e2a6ff6d91a2ace2d6d048fc7109fefecd5047ab6c437ba0e9252ed')
diff --git a/pcr/tinc-pre/tincd@.service b/pcr/tinc-pre/tincd@.service
new file mode 100644
index 000000000..069bf4570
--- /dev/null
+++ b/pcr/tinc-pre/tincd@.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Tinc daemon for net %i
+After=network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/tincd -n %i
+
+[Install]
+WantedBy=multi-user.target
diff --git a/pcr/zita-convolver/PKGBUILD b/pcr/zita-convolver/PKGBUILD
deleted file mode 100644
index 5017f144f..000000000
--- a/pcr/zita-convolver/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Maintainer : Guest One <theguestone at gmail dot com>
-
-pkgname=zita-convolver
-pkgver=3.1.0
-pkgrel=1
-pkgdesc="Convolution library for aeolus and jconvolver"
-arch=('i686' 'x86_64')
-url="http://kokkinizita.linuxaudio.org/linuxaudio"
-license=('GPL')
-depends=('fftw' 'gcc-libs')
-source=("http://kokkinizita.linuxaudio.org/linuxaudio/downloads/zita-convolver-$pkgver.tar.bz2")
-md5sums=('7e264d0fb0d8ea277cdb4e33d764c68a')
-
-build() {
-  cd "$srcdir/zita-convolver-$pkgver/libs"
-
-  sed -i 's/usr\/local/usr/' Makefile
-  sed -i 's/ldconfig//' Makefile
-
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver/libs"
-
-  make SUFFIX="" PREFIX="$pkgdir/usr" DESTDIR=${PKGDIR} install 
-
-
-  # Another failed attempt at trying to be clever. A simple call to ldconfig might have worked.
-  #  ln -s lib$pkgname.so.$pkgver \
-  #    "$pkgdir/usr/lib/lib$pkgname.so.${pkgver%%.*}"
-  
-  #  ln -s lib${pkgname}.so.$pkgver ${pkgdir}/usr/lib/lib${pkgname}.so
-}
-
-
diff --git a/~coadde/cross-binutils/PKGBUILD b/~coadde/cross-binutils/PKGBUILD
new file mode 100644
index 000000000..5f322af4f
--- /dev/null
+++ b/~coadde/cross-binutils/PKGBUILD
@@ -0,0 +1,374 @@
+# Maintainer: Márcio Silva <coadde@lavabit.com>
+# Contributor: André Silva <emulatorman@lavabit.com>
+
+# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
+
+#+-------------------+-----------------------+-------------+------------------------------+
+#| _CARCH            | _os (GNU/Linux-libre) | _os (GNU)   | _os (GNU/Linux-libre uClibc) |
+#+-------------------+-----------------------+-------------+------------------------------+
+#| mips64el          | unknown-linux-gnu     | -           | unknown-uclinux-gnu          |
+#| x86_64            | unknown-linux-gnu     | unknown-gnu | unknown-uclinux-gnu          |
+#| i[65]86           | pc-linux-gnu          | pc-gnu      | unknown-uclinux-gnu          |
+#| aarch64{,_be}     | unknown-linux-gnu     | -           | unknown-uclinux-gnu          |
+#| arm{,v[765]}{,eb} | unknown-linux-gnueabi | -           | unknown-uclinux-gnueabi      |
+#| sparc64           | unknown-linux-gnu     | -           | -                            |
+#| ia64              | unknown-linux-gnu     | -           | -                            |
+#+-------------------+-----------------------+-------------+------------------------------+
+
+#+----------------+--------------------+
+#| _CARCH         | _os (ELF/EABI)     |
+#+----------------+--------------------+
+#| xtensa         | unknown-elf        |
+#| mips64{,el}    | unknown-elf        |
+#| mips32{,el}    | unknown-elf        |
+#| x86_64         | unknown-elf        |
+#| i[653]86       | unknown-elf        |
+#| aarch64{,_be}  | unknown-elf        |
+#| arm{,eb}       | unknown-eabi       |
+#| powerpc64{,le} | unknown-{elf,eabi} |
+#| powerpc32{,le} | unknown-{elf,eabi} |
+#| sh64{,l}       | unknown-elf        |
+#| sh{,l}         | unknown-elf        |
+#| m68k           | unknown-elf        |
+#+----------------+--------------------+
+
+#---------------------------------------------------------------------------------------------------------------------------------------------
+
+_pkgname="binutils"
+
+### Base FLAGS: ###
+_CARCH="x86_64"
+_os="unknown-linux-gnu"
+_target="${_CARCH}-${_os}"
+_multilib="no"
+
+### Patch FLAGS: ###
+_patch_ath9k_htc_fw="no"
+
+#---------------------------------------------------------------------------------------------------------------------------------------------
+
+# For "_multilib"
+[[ ${_multilib} == "yes" ]] && {
+  _multilib_name="-multilib"
+  _multilib_desc=" for multilib"
+}
+[[ ${_CARCH} == i686 ||
+   ${_CARCH} == i586 ||
+   ${_CARCH} == i386 ||
+   ${_CARCH} == xtensa ||
+   ${_CARCH} == mips32 ||
+   ${_CARCH} == mips32el ||
+   ${_CARCH} == arm ||
+   ${_CARCH} == armeb ||
+   ${_CARCH} == armv7 ||
+   ${_CARCH} == armv7eb ||
+   ${_CARCH} == armv6 ||
+   ${_CARCH} == armv6eb ||
+   ${_CARCH} == armv5 ||
+   ${_CARCH} == armv5eb ||
+   ${_CARCH} == powerpc32 ||
+   ${_CARCH} == powerpc32le ||
+   ${_CARCH} == sh ||
+   ${_CARCH} == shl ||
+   ${_CARCH} == m68k ]] && _multilib="no"
+
+# For "_patch_ath9k_htc_fw"
+[[ ${_patch_ath9k_htc_fw} == "yes" ]] && {
+  _ath9k_htc_name="-ath9k-htc"
+  _ath9k_htc_desc=" adapted for ath9k-htc firmware"
+  _multilib="no"
+}
+[[ ${_CARCH} != xtensa ]] && _patch_ath9k_htc_fw="no"
+
+#---------------------------------------------------------------------------------------------------------------------------------------------
+
+pkgname=(
+  "${_target}-${_pkgname}${_multilib_name}${_ath9k_htc_name}"
+  "${_pkgname}-common"
+)
+pkgver=2.23.2
+pkgrel=2
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.gnu.org/software/${_pkgname}/"
+license=('GPL2')
+groups=('cross-devel')
+checkdepends=('dejagnu' 'bc')
+# Make sure we compile this with {$CHOST-,}gcc-multilib
+[[ ${_multilib} == "yes" ]] && makedepends=('gcc-multilib') # makedepends=("$CHOST-gcc-multilib")
+options=('!libtool' '!distcc' '!ccache')
+source=(ftp://ftp.gnu.org/gnu/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2{,.sig}
+        ${_pkgname}-2.23.2-texinfo-5.0.patch)
+md5sums=('4f8fa651e35ef262edc01d60fb45702e'
+         'dfde4428f08d91f309cdcfe92bf28d08'
+         '34e439ce23213a91e2af872dfbb5094c')
+
+[[ ${_patch_ath9k_htc_fw} == "yes" ]] && {
+  source+=("_patch_ath9k_htc_fw.patch::https://raw.github.com/qca/open-ath9k-htc-firmware/1.3.2/local/patches/${_pkgname}.patch")
+  md5sums+=('7077126d96e9a755a0eaddb5505efe68')
+}
+
+#---------------------------------------------------------------------------------------------------------------------------------------------
+
+prepare() {
+  cd ${srcdir}/${_pkgname}-${pkgver}
+
+  msg "http://sourceware.org/git/?p=${_pkgname}.git;a=patch;h=e02bf935"
+  msg "http://sourceware.org/git/?p=${_pkgname}.git;a=patch;h=935f8542"
+  patch -p1 -i ${srcdir}/${_pkgname}-2.23.2-texinfo-5.0.patch
+
+  [[ ${_patch_ath9k_htc_fw} == "yes" ]] && {
+    patch -p1 -i ${srcdir}/_patch_ath9k_htc_fw.patch
+  }
+
+  msg "hack! - libiberty configure tests for header files using" "$CPP $CPPFLAGS"
+  sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure
+
+  mkdir -v ${srcdir}/${_pkgname}-build
+}
+
+#---------------------------------------------------------------------------------------------------------------------------------------------
+
+build() {
+  cd ${srcdir}/${_pkgname}-build
+
+  [[ $CARCH != ${_CARCH} ]] && _TARGET="--target=${_target}"
+  if [[ $CARCH == x86_64 ||
+        $CARCH == mips64el ||
+        $CARCH == aarch64 ||
+        $CARCH == aarch64_be ||
+        $CARCH == sparc64 ||
+        $CARCH == ia64 ]]; then
+    _LIB_PATH="--with-lib-path=/usr/lib:/usr/lib32:/usr/local/lib:/usr/local/lib32:/usr/${_target}/lib:/usr/${_target}/lib32"
+  else
+    _LIB_PATH="--with-lib-path=/usr/lib:/usr/local/lib:/usr/${_target}/lib"
+  fi
+
+  if [[ ${_multilib} == "yes" ]]; then
+    _MULTILIB='--enable-multilib'
+  else
+    _MULTILIB='--disable-multilib'
+  fi
+
+  ${srcdir}/${_pkgname}-${pkgver}/configure --prefix=/opt/${pkgname[0]}/${pkgver} \
+    $_TARGET $_LIB_PATH \
+    --program-prefix=${_target}- \
+    --program-suffix=${_multilib_name}${_ath9k_htc_name}-${pkgver} \
+    --with-bugurl=https://labs.parabola.nu/ \
+    --enable-ld=default --enable-gold \
+    --enable-plugins --enable-threads \
+    --with-pic --enable-shared \
+    --disable-werror ${_MULTILIB}
+    # !!! Disabled, due which problematic libretools (prepare() and build() with --bindir, --includedir and --datarootdir)" !!!
+    #--bindir=/usr/bin --includedir=/usr/include --datarootdir=/usr/share \
+
+  msg "Check the host environment and makes sure all the necessary tools are available"
+  make configure-host
+
+  make tooldir=/opt/${pkgname[0]}/${pkgver}
+}
+
+#---------------------------------------------------------------------------------------------------------------------------------------------
+
+check() {
+  cd ${srcdir}/${_pkgname}-build
+  
+  msg "Unset LDFLAGS as testsuite makes assumptions about which ones are active"
+  msg "do not abort on errors - manually check log files"
+  make LDFLAGS="" -k check || true
+}
+
+#---------------------------------------------------------------------------------------------------------------------------------------------
+
+_target-binutils() {
+  pkgrel=$pkgrel
+  pkgdesc="A set of programs to assemble and manipulate binary and object files${_multilib_desc}${_ath9k_htc_desc}. (${_target} architecture)"
+  depends=('glibc>=2.17' 'zlib' "${_pkgname}-common")
+  [[ $CHOST == ${_target} ]] && provides=("${_pkgname}=${pkgver}")
+  if [[ ${_multilib} == "yes" ]]; then
+    groups+=('multilib-devel')
+  else
+    groups+=('base-devel')
+  fi
+  groups+=("${_target}-devel")
+  install="${_target}-${_pkgname}${_multilib_name}${_ath9k_htc_name}.install"
+
+  cd ${srcdir}/${_pkgname}-build
+  make prefix=${pkgdir}/opt/${pkgname}/${pkgver} tooldir=${pkgdir}/opt/${pkgname}/${pkgver} install
+
+  # temp #
+  msg "!!! Move 'bin', 'include' and 'share' dir to /usr, !!!"
+  msg "!!! due which problematic libretools ('prepare()' and 'build()' with --bindir, --includedir and --datarootdir) !!!"
+  install -vd ${pkgdir}/usr
+  if [[ $CARCH == ${_CARCH} ]]; then
+    mv -v ${pkgdir}/{opt/${pkgname}/${pkgver}/{bin,include,share},usr}
+  else
+    mv -v ${pkgdir}/{opt/${pkgname}/${pkgver}/{bin,$CHOST/${_target}/include,share},usr}
+  fi
+  # temp #
+
+  [[ $CARCH != ${_CARCH} ]] && {
+    msg "Move 'lib' files and directories, and remove architecture directories"
+    mv -v ${pkgdir}/opt/${pkgname}/${pkgver}/{$CHOST/${_target}/lib/*,lib}
+    rmdir -v ${pkgdir}/opt/${pkgname}/${pkgver}/$CHOST/{${_target}/{lib,},}
+  }
+
+  msg "Change lib-path on ldscripts files"
+  sed -i "/^SEARCH_DIR/ s|/${pkgver}/${_target}/lib|/${pkgver}/lib|g;
+          /^SEARCH_DIR/ s|/${pkgver}/lib|/${pkgver}/lib32|g;
+          /^SEARCH_DIR/ s|/${pkgver}/lib3264|/${pkgver}/lib|g;
+          /^SEARCH_DIR/ s|/${pkgver}/lib32x32|/${pkgver}/lib|g;
+         " ${pkgdir}/opt/${pkgname}/${pkgver}/lib/ldscripts/*
+
+  _removebin=(ar as nm objcopy objdump ranlib strip)
+  for _rbin in ${_removebin[@]}; do
+    msg "Remove conflicting binaries"
+    rm -v ${pkgdir}/usr/bin/${_rbin[@]}
+  done
+
+  msg "Create links for libraries"
+  install -vd ${pkgdir}/{usr/${_target},etc/ld.so.conf.d}
+  ln -vs ../lib ${pkgdir}/usr/${_target}/lib
+  echo /opt/${pkgname}/${pkgver}/lib > ${pkgdir}/etc/ld.so.conf.d/${pkgname}-${pkgver}.conf
+
+  msg "Install PIC libiberty.a"
+  install -vm644 libiberty/pic/libiberty.a ${pkgdir}/opt/${pkgname[0]}/${pkgver}/lib
+
+  msg "Remove unnecessaries manuals and create links for manuals"
+  _man=$(ls -1A ${pkgdir}/usr/share/man/man1)
+  for _man_stage1 in ${_man[@]}; do
+    _man_stage2=${_man_stage1/${_multilib_name}${_ath9k_htc_name}-${pkgver}/}
+    _manuals=${_man_stage2/${_target}-/}
+    rm -v ${pkgdir}/usr/share/man/man1/${_man_stage1}
+    ln -vs ${_manuals}.gz ${pkgdir}/usr/share/man/man1/${_man_stage1}.gz
+  done
+
+  msg "Remove unnecessaries files and directories"
+  rm -vr ${pkgdir}/usr/{include,share/{info,locale}}
+}
+
+#---------------------------------------------------------------------------------------------------------------------------------------------
+
+# GNU/Linux-libre with GNU C Library (glibc)
+package_mips64el-unknown-linux-gnu-binutils() { _target-binutils; }
+package_mips64el-unknown-linux-gnu-binutils-multilib() { _target-binutils; }
+package_x86_64-unknown-linux-gnu-binutils() { _target-binutils; }
+package_x86_64-unknown-linux-gnu-binutils-multilib() { _target-binutils; }
+package_i686-pc-linux-gnu-binutils() { _target-binutils; }
+package_i586-pc-linux-gnu-binutils() { _target-binutils; }
+package_aarch64-unknown-linux-gnu-binutils() { _target-binutils; }
+package_aarch64-unknown-linux-gnu-binutils-multilib() { _target-binutils; }
+package_aarch64_be-unknown-linux-gnu-binutils() { _target-binutils; }
+package_aarch64_be-unknown-linux-gnu-binutils-multilib() { _target-binutils; }
+package_arm-unknown-linux-gnueabi-binutils() { _target-binutils; }
+package_armeb-unknown-linux-gnueabi-binutils() { _target-binutils; }
+package_armv7-unknown-linux-gnueabi-binutils() { _target-binutils; }
+package_armv7eb-unknown-linux-gnueabi-binutils() { _target-binutils; }
+package_armv6-unknown-linux-gnueabi-binutils() { _target-binutils; }
+package_armv6eb-unknown-linux-gnueabi-binutils() { _target-binutils; }
+package_armv5-unknown-linux-gnueabi-binutils() { _target-binutils; }
+package_armv5eb-unknown-linux-gnueabi-binutils() { _target-binutils; }
+package_sparc64-unknown-linux-gnu-binutils() { _target-binutils; }
+package_sparc64-unknown-linux-gnu-binutils-multilib() { _target-binutils; }
+package_ia64-unknown-linux-gnu-binutils() { _target-binutils; }
+package_ia64-unknown-linux-gnu-binutils-multilib() { _target-binutils; }
+
+# GNU
+package_x86_64-unknown-gnu-binutils() { _target-binutils; }
+package_x86_64-unknown-gnu-binutils-multilib() { _target-binutils; }
+package_i686-pc-gnu-binutils() { _target-binutils; }
+package_i586-pc-gnu-binutils() { _target-binutils; }
+
+# GNU/Linux-libre with uClibc
+package_mips64el-unknown-uclinux-gnu-binutils() { _target-binutils; }
+package_mips64el-unknown-uclinux-gnu-binutils-multilib() { _target-binutils; }
+package_x86_64-unknown-uclinux-gnu-binutils() { _target-binutils; }
+package_x86_64-unknown-uclinux-gnu-binutils-multilib() { _target-binutils; }
+package_i686-pc-uclinux-gnu-binutils() { _target-binutils; }
+package_i586-pc-uclinux-gnu-binutils() { _target-binutils; }
+package_aarch64-unknown-uclinux-gnu-binutils() { _target-binutils; }
+package_aarch64-unknown-uclinux-gnu-binutils-multilib() { _target-binutils; }
+package_aarch64_be-unknown-uclinux-gnu-binutils() { _target-binutils; }
+package_aarch64_be-unknown-uclinux-gnu-binutils-multilib() { _target-binutils; }
+package_arm-unknown-uclinux-gnueabi-binutils() { _target-binutils; }
+package_armeb-unknown-uclinux-gnueabi-binutils() { _target-binutils; }
+package_armv7-unknown-uclinux-gnueabi-binutils() { _target-binutils; }
+package_armv7eb-unknown-uclinux-gnueabi-binutils() { _target-binutils; }
+package_armv6-unknown-uclinux-gnueabi-binutils() { _target-binutils; }
+package_armv6eb-unknown-uclinux-gnueabi-binutils() { _target-binutils; }
+package_armv5-unknown-uclinux-gnueabi-binutils() { _target-binutils; }
+package_armv5eb-unknown-uclinux-gnueabi-binutils() { _target-binutils; }
+
+# ELF or EABI only
+package_xtensa-unknown-elf-binutils() { _target-binutils; }
+package_xtensa-unknown-elf-binutils-ath9k_htc() { _target-binutils; }
+package_mips64el-unknown-elf-binutils() { _target-binutils; }
+package_mips64el-unknown-elf-binutils-multilib() { _target-binutils; }
+package_mips64-unknown-elf-binutils() { _target-binutils; }
+package_mips64-unknown-elf-binutils-multilib() { _target-binutils; }
+package_mips32el-unknown-elf-binutils() { _target-binutils; }
+package_mips32-unknown-elf-binutils() { _target-binutils; }
+package_x86_64-unknown-elf-binutils() { _target-binutils; }
+package_x86_64-unknown-elf-binutils-multilib() { _target-binutils; }
+package_i686-unknown-elf-binutils() { _target-binutils; }
+package_i586-unknown-elf-binutils() { _target-binutils; }
+package_i386-unknown-elf-binutils() { _target-binutils; }
+package_aarch64-unknown-elf-binutils() { _target-binutils; }
+package_aarch64-unknown-elf-binutils-multilib() { _target-binutils; }
+package_aarch64_be-unknown-elf-binutils() { _target-binutils; }
+package_aarch64_be-unknown-elf-binutils-multilib() { _target-binutils; }
+package_arm-unknown-eabi-binutils() { _target-binutils; }
+package_armeb-unknown-eabi-binutils() { _target-binutils; }
+package_powerpc64-unknown-elf-binutils() { _target-binutils; }
+package_powerpc64-unknown-elf-binutils-multilib() { _target-binutils; }
+package_powerpc64le-unknown-elf-binutils() { _target-binutils; }
+package_powerpc64le-unknown-elf-binutils-multilib() { _target-binutils; }
+package_powerpc32-unknown-elf-binutils() { _target-binutils; }
+package_powerpc32le-unknown-elf-binutils() { _target-binutils; }
+package_powerpc64-unknown-eabi-binutils() { _target-binutils; }
+package_powerpc64-unknown-eabi-binutils-multilib() { _target-binutils; }
+package_powerpc64le-unknown-eabi-binutils() { _target-binutils; }
+package_powerpc64le-unknown-eabi-binutils-multilib() { _target-binutils; }
+package_powerpc32-unknown-eabi-binutils() { _target-binutils; }
+package_powerpc32le-unknown-eabi-binutils() { _target-binutils; }
+package_sh64-unknown-elf-binutils() { _target-binutils; }
+package_sh64-unknown-elf-binutils-multilib() { _target-binutils; }
+package_sh64l-unknown-elf-binutils() { _target-binutils; }
+package_sh64l-unknown-elf-binutils-multilib() { _target-binutils; }
+package_sh-unknown-elf-binutils() { _target-binutils; }
+package_shl-unknown-elf-binutils() { _target-binutils; }
+package_m68k-unknown-elf-binutils() { _target-binutils; }
+
+#---------------------------------------------------------------------------------------------------------------------------------------------
+
+package_binutils-common() {
+  pkgrel=$pkgrel
+  pkgdesc="A set of programs to assemble and manipulate binary and object files. (headers, docs and locales files only)"
+  arch=('any')
+  depends=('linktools')
+  install="${_pkgname}.install"
+
+  cd ${srcdir}/${_pkgname}-build
+  make prefix=${pkgdir}/opt/${pkgname}/${pkgver} tooldir=${pkgdir}/opt/${pkgname}/${pkgver} install
+
+  [[ $CARCH != ${_CARCH} ]] && {
+    msg "Move 'include' files and directories"
+    mv -v ${pkgdir}/opt/${pkgname}/${pkgver}/{$CHOST/${_target}/include,}
+  }
+
+  msg "Add some useful headers"
+  install -vm644 ${srcdir}/${_pkgname}-${pkgver}/include/{demangle,libiberty}.h ${pkgdir}/opt/${pkgname}/${pkgver}/include
+
+  msg "Remove unnecessaries files and directories"
+  rm -vr ${pkgdir}/opt/${pkgname}/${pkgver}/{bin,lib}
+  [[ $CARCH != ${_CARCH} ]] && {
+    rm -vr ${pkgdir}/opt/${pkgname}/${pkgver}/$CHOST
+  }
+
+  msg "Rename manuals"
+  _man=$(ls -1A ${pkgdir}/opt/${pkgname}/${pkgver}/share/man/man1)
+  for _man_stage1 in ${_man[@]}; do
+    _man_stage2=${_man_stage1/${_multilib_name}${_ath9k_htc_name}-${pkgver}/}
+    _manuals=${_man_stage2/${_target}-/}
+    mv -v ${pkgdir}/opt/${pkgname}/${pkgver}/share/man/man1/{${_man_stage1},${_manuals}}
+  done
+}
diff --git a/~coadde/cross-binutils/aarch64-unknown-elf-binutils-multilib.install b/~coadde/cross-binutils/aarch64-unknown-elf-binutils-multilib.install
new file mode 100644
index 000000000..e2cb3892c
--- /dev/null
+++ b/~coadde/cross-binutils/aarch64-unknown-elf-binutils-multilib.install
@@ -0,0 +1,16 @@
+_pkgname=aarch64-unknown-elf-binutils-multilib
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/aarch64-unknown-elf-binutils.install b/~coadde/cross-binutils/aarch64-unknown-elf-binutils.install
new file mode 100644
index 000000000..7546e29a1
--- /dev/null
+++ b/~coadde/cross-binutils/aarch64-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=aarch64-unknown-elf-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/aarch64-unknown-linux-gnu-binutils-multilib.install b/~coadde/cross-binutils/aarch64-unknown-linux-gnu-binutils-multilib.install
new file mode 100644
index 000000000..6f986cd41
--- /dev/null
+++ b/~coadde/cross-binutils/aarch64-unknown-linux-gnu-binutils-multilib.install
@@ -0,0 +1,16 @@
+_pkgname=aarch64-unknown-linux-gnu-binutils-multilib
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/aarch64-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/aarch64-unknown-linux-gnu-binutils.install
new file mode 100644
index 000000000..96d20da4a
--- /dev/null
+++ b/~coadde/cross-binutils/aarch64-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=aarch64-unknown-linux-gnu-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/aarch64-unknown-uclinux-gnu-binutils-multilib.install b/~coadde/cross-binutils/aarch64-unknown-uclinux-gnu-binutils-multilib.install
new file mode 100644
index 000000000..0420b342a
--- /dev/null
+++ b/~coadde/cross-binutils/aarch64-unknown-uclinux-gnu-binutils-multilib.install
@@ -0,0 +1,16 @@
+_pkgname=aarch64-unknown-uclinux-gnu-binutils-multilib
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/aarch64-unknown-uclinux-gnu-binutils.install b/~coadde/cross-binutils/aarch64-unknown-uclinux-gnu-binutils.install
new file mode 100644
index 000000000..fa1e49875
--- /dev/null
+++ b/~coadde/cross-binutils/aarch64-unknown-uclinux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=aarch64-unknown-uclinux-gnu-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/aarch64_be-unknown-elf-binutils-multilib.install b/~coadde/cross-binutils/aarch64_be-unknown-elf-binutils-multilib.install
new file mode 100644
index 000000000..ae71b8f32
--- /dev/null
+++ b/~coadde/cross-binutils/aarch64_be-unknown-elf-binutils-multilib.install
@@ -0,0 +1,16 @@
+_pkgname=aarch64_be-unknown-elf-binutils-multilib
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/aarch64_be-unknown-elf-binutils.install b/~coadde/cross-binutils/aarch64_be-unknown-elf-binutils.install
new file mode 100644
index 000000000..886d38ddc
--- /dev/null
+++ b/~coadde/cross-binutils/aarch64_be-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=aarch64_be-unknown-elf-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/aarch64_be-unknown-linux-gnu-binutils-multilib.install b/~coadde/cross-binutils/aarch64_be-unknown-linux-gnu-binutils-multilib.install
new file mode 100644
index 000000000..21e87d4a6
--- /dev/null
+++ b/~coadde/cross-binutils/aarch64_be-unknown-linux-gnu-binutils-multilib.install
@@ -0,0 +1,16 @@
+_pkgname=aarch64_be-unknown-linux-gnu-binutils-multilib
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/aarch64_be-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/aarch64_be-unknown-linux-gnu-binutils.install
new file mode 100644
index 000000000..7c040a1d1
--- /dev/null
+++ b/~coadde/cross-binutils/aarch64_be-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=aarch64_be-unknown-linux-gnu-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/aarch64_be-unknown-uclinux-gnu-binutils-multilib.install b/~coadde/cross-binutils/aarch64_be-unknown-uclinux-gnu-binutils-multilib.install
new file mode 100644
index 000000000..8ecd22ed1
--- /dev/null
+++ b/~coadde/cross-binutils/aarch64_be-unknown-uclinux-gnu-binutils-multilib.install
@@ -0,0 +1,16 @@
+_pkgname=aarch64_be-unknown-uclinux-gnu-binutils-multilib
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/aarch64_be-unknown-uclinux-gnu-binutils.install b/~coadde/cross-binutils/aarch64_be-unknown-uclinux-gnu-binutils.install
new file mode 100644
index 000000000..017efb727
--- /dev/null
+++ b/~coadde/cross-binutils/aarch64_be-unknown-uclinux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=aarch64_be-unknown-uclinux-gnu-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/arm-unknown-eabi-binutils.install b/~coadde/cross-binutils/arm-unknown-eabi-binutils.install
new file mode 100644
index 000000000..2a5ac8d12
--- /dev/null
+++ b/~coadde/cross-binutils/arm-unknown-eabi-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=arm-unknown-eabi-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/arm-unknown-linux-gnueabi.install b/~coadde/cross-binutils/arm-unknown-linux-gnueabi.install
new file mode 100644
index 000000000..011cd2ae3
--- /dev/null
+++ b/~coadde/cross-binutils/arm-unknown-linux-gnueabi.install
@@ -0,0 +1,16 @@
+_pkgname=arm-unknown-linux-gnueabi-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/arm-unknown-uclinux-gnueabi.install b/~coadde/cross-binutils/arm-unknown-uclinux-gnueabi.install
new file mode 100644
index 000000000..e7cee926c
--- /dev/null
+++ b/~coadde/cross-binutils/arm-unknown-uclinux-gnueabi.install
@@ -0,0 +1,16 @@
+_pkgname=arm-unknown-uclinux-gnueabi-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/armeb-unknown-eabi-binutils.install b/~coadde/cross-binutils/armeb-unknown-eabi-binutils.install
new file mode 100644
index 000000000..363e4b477
--- /dev/null
+++ b/~coadde/cross-binutils/armeb-unknown-eabi-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=armeb-unknown-eabi-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/armeb-unknown-linux-gnueabi.install b/~coadde/cross-binutils/armeb-unknown-linux-gnueabi.install
new file mode 100644
index 000000000..75fa9f797
--- /dev/null
+++ b/~coadde/cross-binutils/armeb-unknown-linux-gnueabi.install
@@ -0,0 +1,16 @@
+_pkgname=armeb-unknown-linux-gnueabi-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/armeb-unknown-uclinux-gnueabi.install b/~coadde/cross-binutils/armeb-unknown-uclinux-gnueabi.install
new file mode 100644
index 000000000..b44e358f1
--- /dev/null
+++ b/~coadde/cross-binutils/armeb-unknown-uclinux-gnueabi.install
@@ -0,0 +1,16 @@
+_pkgname=armeb-unknown-uclinux-gnueabi-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/armv5-unknown-linux-gnueabi.install b/~coadde/cross-binutils/armv5-unknown-linux-gnueabi.install
new file mode 100644
index 000000000..afdc1ebc8
--- /dev/null
+++ b/~coadde/cross-binutils/armv5-unknown-linux-gnueabi.install
@@ -0,0 +1,16 @@
+_pkgname=armv5-unknown-linux-gnueabi-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/armv5-unknown-uclinux-gnueabi.install b/~coadde/cross-binutils/armv5-unknown-uclinux-gnueabi.install
new file mode 100644
index 000000000..69faa8902
--- /dev/null
+++ b/~coadde/cross-binutils/armv5-unknown-uclinux-gnueabi.install
@@ -0,0 +1,16 @@
+_pkgname=armv5-unknown-uclinux-gnueabi-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/armv5eb-unknown-linux-gnueabi.install b/~coadde/cross-binutils/armv5eb-unknown-linux-gnueabi.install
new file mode 100644
index 000000000..1b92d60a0
--- /dev/null
+++ b/~coadde/cross-binutils/armv5eb-unknown-linux-gnueabi.install
@@ -0,0 +1,16 @@
+_pkgname=armv5eb-unknown-linux-gnueabi-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/armv5eb-unknown-uclinux-gnueabi.install b/~coadde/cross-binutils/armv5eb-unknown-uclinux-gnueabi.install
new file mode 100644
index 000000000..3370ab5b5
--- /dev/null
+++ b/~coadde/cross-binutils/armv5eb-unknown-uclinux-gnueabi.install
@@ -0,0 +1,16 @@
+_pkgname=armv5eb-unknown-uclinux-gnueabi-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/armv6-unknown-linux-gnueabi.install b/~coadde/cross-binutils/armv6-unknown-linux-gnueabi.install
new file mode 100644
index 000000000..b5dcd7d38
--- /dev/null
+++ b/~coadde/cross-binutils/armv6-unknown-linux-gnueabi.install
@@ -0,0 +1,16 @@
+_pkgname=armv6-unknown-linux-gnueabi-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/armv6-unknown-uclinux-gnueabi.install b/~coadde/cross-binutils/armv6-unknown-uclinux-gnueabi.install
new file mode 100644
index 000000000..63169847e
--- /dev/null
+++ b/~coadde/cross-binutils/armv6-unknown-uclinux-gnueabi.install
@@ -0,0 +1,16 @@
+_pkgname=armv6-unknown-uclinux-gnueabi-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/armv6eb-unknown-linux-gnueabi.install b/~coadde/cross-binutils/armv6eb-unknown-linux-gnueabi.install
new file mode 100644
index 000000000..72ea5a267
--- /dev/null
+++ b/~coadde/cross-binutils/armv6eb-unknown-linux-gnueabi.install
@@ -0,0 +1,16 @@
+_pkgname=armv6eb-unknown-linux-gnueabi-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/armv6eb-unknown-uclinux-gnueabi.install b/~coadde/cross-binutils/armv6eb-unknown-uclinux-gnueabi.install
new file mode 100644
index 000000000..ba95c1b5d
--- /dev/null
+++ b/~coadde/cross-binutils/armv6eb-unknown-uclinux-gnueabi.install
@@ -0,0 +1,16 @@
+_pkgname=armv6eb-unknown-uclinux-gnueabi-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/armv7-unknown-linux-gnueabi.install b/~coadde/cross-binutils/armv7-unknown-linux-gnueabi.install
new file mode 100644
index 000000000..b0cadf5af
--- /dev/null
+++ b/~coadde/cross-binutils/armv7-unknown-linux-gnueabi.install
@@ -0,0 +1,16 @@
+_pkgname=armv7-unknown-linux-gnueabi-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/armv7-unknown-uclinux-gnueabi.install b/~coadde/cross-binutils/armv7-unknown-uclinux-gnueabi.install
new file mode 100644
index 000000000..42f2d1cea
--- /dev/null
+++ b/~coadde/cross-binutils/armv7-unknown-uclinux-gnueabi.install
@@ -0,0 +1,16 @@
+_pkgname=armv7-unknown-uclinux-gnueabi-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/armv7eb-unknown-linux-gnueabi.install b/~coadde/cross-binutils/armv7eb-unknown-linux-gnueabi.install
new file mode 100644
index 000000000..b4510863d
--- /dev/null
+++ b/~coadde/cross-binutils/armv7eb-unknown-linux-gnueabi.install
@@ -0,0 +1,16 @@
+_pkgname=armv7eb-unknown-linux-gnueabi-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/armv7eb-unknown-uclinux-gnueabi.install b/~coadde/cross-binutils/armv7eb-unknown-uclinux-gnueabi.install
new file mode 100644
index 000000000..faa3e3b77
--- /dev/null
+++ b/~coadde/cross-binutils/armv7eb-unknown-uclinux-gnueabi.install
@@ -0,0 +1,16 @@
+_pkgname=armv7eb-unknown-uclinux-gnueabi-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/libre/xtensa-unknown-elf-glibc/xtensa-unknown-elf-glibc.install b/~coadde/cross-binutils/binutils.install
index f8147a6cf..9de0533ee 100644
--- a/libre/xtensa-unknown-elf-glibc/xtensa-unknown-elf-glibc.install
+++ b/~coadde/cross-binutils/binutils.install
@@ -1,19 +1,17 @@
 infodir=usr/share/info
-filelist=(libc.info{,-1,-2,-3,-4,-5,-6,-7,-8,-9,-10,-11})
+filelist=(as.info bfd.info binutils.info gprof.info ld.info)
 
 post_upgrade() {
-  ldconfig -r .
-  locale-gen
-  
-  [[ -x usr/bin/install-info ]] || return 0
+  [ -x usr/bin/install-info ] || return 0
   for file in ${filelist[@]}; do
     install-info $infodir/$file.gz $infodir/dir 2> /dev/null
   done
 }
 
 pre_remove() {
-  [[ -x usr/bin/install-info ]] || return 0
+  [ -x usr/bin/install-info ] || return 0
   for file in ${filelist[@]}; do
     install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
   done
 }
+
diff --git a/~coadde/cross-binutils/i386-unknown-elf-binutils.install b/~coadde/cross-binutils/i386-unknown-elf-binutils.install
new file mode 100644
index 000000000..572ecca6e
--- /dev/null
+++ b/~coadde/cross-binutils/i386-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=i386-unknown-elf-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/i586-pc-gnu-binutils.install b/~coadde/cross-binutils/i586-pc-gnu-binutils.install
new file mode 100644
index 000000000..6e4dac15d
--- /dev/null
+++ b/~coadde/cross-binutils/i586-pc-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=i586-pc-gnu-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/i586-pc-linux-gnu-binutils.install b/~coadde/cross-binutils/i586-pc-linux-gnu-binutils.install
new file mode 100644
index 000000000..f14abdfaa
--- /dev/null
+++ b/~coadde/cross-binutils/i586-pc-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=i586-pc-linux-gnu-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/i586-pc-uclinux-gnu-binutils.install b/~coadde/cross-binutils/i586-pc-uclinux-gnu-binutils.install
new file mode 100644
index 000000000..2729ec574
--- /dev/null
+++ b/~coadde/cross-binutils/i586-pc-uclinux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=i586-pc-uclinux-gnu-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/i586-unknown-elf-binutils.install b/~coadde/cross-binutils/i586-unknown-elf-binutils.install
new file mode 100644
index 000000000..4c55c2c6e
--- /dev/null
+++ b/~coadde/cross-binutils/i586-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=i586-unknown-elf-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/i686-pc-gnu-binutils.install b/~coadde/cross-binutils/i686-pc-gnu-binutils.install
new file mode 100644
index 000000000..1fbfac209
--- /dev/null
+++ b/~coadde/cross-binutils/i686-pc-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=i686-pc-gnu-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/i686-pc-linux-gnu-binutils.install b/~coadde/cross-binutils/i686-pc-linux-gnu-binutils.install
new file mode 100644
index 000000000..a0498ff51
--- /dev/null
+++ b/~coadde/cross-binutils/i686-pc-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=i686-pc-linux-gnu-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/i686-pc-uclinux-gnu-binutils.install b/~coadde/cross-binutils/i686-pc-uclinux-gnu-binutils.install
new file mode 100644
index 000000000..04ece7396
--- /dev/null
+++ b/~coadde/cross-binutils/i686-pc-uclinux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=i686-pc-uclinux-gnu-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/i686-unknown-elf-binutils.install b/~coadde/cross-binutils/i686-unknown-elf-binutils.install
new file mode 100644
index 000000000..f92849138
--- /dev/null
+++ b/~coadde/cross-binutils/i686-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=i686-unknown-elf-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/ia64-unknown-linux-gnu-binutils-multilib.install b/~coadde/cross-binutils/ia64-unknown-linux-gnu-binutils-multilib.install
new file mode 100644
index 000000000..a31a76a41
--- /dev/null
+++ b/~coadde/cross-binutils/ia64-unknown-linux-gnu-binutils-multilib.install
@@ -0,0 +1,16 @@
+_pkgname=ia64-unknown-linux-gnu-binutils-multilib
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/ia64-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/ia64-unknown-linux-gnu-binutils.install
new file mode 100644
index 000000000..9853a7dce
--- /dev/null
+++ b/~coadde/cross-binutils/ia64-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=ia64-unknown-linux-gnu-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/m68k-unknown-elf-binutils.install b/~coadde/cross-binutils/m68k-unknown-elf-binutils.install
new file mode 100644
index 000000000..b45dcea38
--- /dev/null
+++ b/~coadde/cross-binutils/m68k-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=m68k-unknown-elf-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/mips32-unknown-elf-binutils.install b/~coadde/cross-binutils/mips32-unknown-elf-binutils.install
new file mode 100644
index 000000000..c16855af8
--- /dev/null
+++ b/~coadde/cross-binutils/mips32-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=mips32-unknown-elf-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/mips32el-unknown-elf-binutils.install b/~coadde/cross-binutils/mips32el-unknown-elf-binutils.install
new file mode 100644
index 000000000..83ef0456f
--- /dev/null
+++ b/~coadde/cross-binutils/mips32el-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=mips32el-unknown-elf-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/mips64-unknown-elf-binutils-multilib.install b/~coadde/cross-binutils/mips64-unknown-elf-binutils-multilib.install
new file mode 100644
index 000000000..e24e260f6
--- /dev/null
+++ b/~coadde/cross-binutils/mips64-unknown-elf-binutils-multilib.install
@@ -0,0 +1,16 @@
+_pkgname=mips64-unknown-elf-binutils-multilib
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/mips64-unknown-elf-binutils.install b/~coadde/cross-binutils/mips64-unknown-elf-binutils.install
new file mode 100644
index 000000000..8e5e0a192
--- /dev/null
+++ b/~coadde/cross-binutils/mips64-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=mips64-unknown-elf-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/mips64el-unknown-elf-binutils-multilib.install b/~coadde/cross-binutils/mips64el-unknown-elf-binutils-multilib.install
new file mode 100644
index 000000000..201c805dd
--- /dev/null
+++ b/~coadde/cross-binutils/mips64el-unknown-elf-binutils-multilib.install
@@ -0,0 +1,16 @@
+_pkgname=mips64el-unknown-elf-binutils-multilib
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/mips64el-unknown-elf-binutils.install b/~coadde/cross-binutils/mips64el-unknown-elf-binutils.install
new file mode 100644
index 000000000..ab338a443
--- /dev/null
+++ b/~coadde/cross-binutils/mips64el-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=mips64el-unknown-elf-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/mips64el-unknown-linux-gnu-binutils-multilib.install b/~coadde/cross-binutils/mips64el-unknown-linux-gnu-binutils-multilib.install
new file mode 100644
index 000000000..cff96a72a
--- /dev/null
+++ b/~coadde/cross-binutils/mips64el-unknown-linux-gnu-binutils-multilib.install
@@ -0,0 +1,16 @@
+_pkgname=mips64el-unknown-linux-gnu-binutils-multilib
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/mips64el-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/mips64el-unknown-linux-gnu-binutils.install
new file mode 100644
index 000000000..21b4a2af2
--- /dev/null
+++ b/~coadde/cross-binutils/mips64el-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=mips64el-unknown-linux-gnu-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/mips64el-unknown-uclinux-gnu-binutils-multilib.install b/~coadde/cross-binutils/mips64el-unknown-uclinux-gnu-binutils-multilib.install
new file mode 100644
index 000000000..b633641d5
--- /dev/null
+++ b/~coadde/cross-binutils/mips64el-unknown-uclinux-gnu-binutils-multilib.install
@@ -0,0 +1,16 @@
+_pkgname=mips64el-unknown-uclinux-gnu-binutils-multilib
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/mips64el-unknown-uclinux-gnu-binutils.install b/~coadde/cross-binutils/mips64el-unknown-uclinux-gnu-binutils.install
new file mode 100644
index 000000000..29094da95
--- /dev/null
+++ b/~coadde/cross-binutils/mips64el-unknown-uclinux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=mips64el-unknown-uclinux-gnu-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/powerpc32-unknown-eabi-binutils.install b/~coadde/cross-binutils/powerpc32-unknown-eabi-binutils.install
new file mode 100644
index 000000000..6db625881
--- /dev/null
+++ b/~coadde/cross-binutils/powerpc32-unknown-eabi-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=powerpc32-unknown-eabi-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/powerpc32-unknown-elf-binutils.install b/~coadde/cross-binutils/powerpc32-unknown-elf-binutils.install
new file mode 100644
index 000000000..dcc691e53
--- /dev/null
+++ b/~coadde/cross-binutils/powerpc32-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=powerpc32-unknown-elf-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/powerpc32le-unknown-eabi-binutils.install b/~coadde/cross-binutils/powerpc32le-unknown-eabi-binutils.install
new file mode 100644
index 000000000..dd55db2d7
--- /dev/null
+++ b/~coadde/cross-binutils/powerpc32le-unknown-eabi-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=powerpc32le-unknown-eabi-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/powerpc32le-unknown-elf-binutils.install b/~coadde/cross-binutils/powerpc32le-unknown-elf-binutils.install
new file mode 100644
index 000000000..d304b6799
--- /dev/null
+++ b/~coadde/cross-binutils/powerpc32le-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=powerpc32le-unknown-elf-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/powerpc64-unknown-eabi-binutils-multilib.install b/~coadde/cross-binutils/powerpc64-unknown-eabi-binutils-multilib.install
new file mode 100644
index 000000000..0c1b1d7b8
--- /dev/null
+++ b/~coadde/cross-binutils/powerpc64-unknown-eabi-binutils-multilib.install
@@ -0,0 +1,16 @@
+_pkgname=powerpc64-unknown-eabi-binutils-multilib
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/powerpc64-unknown-eabi-binutils.install b/~coadde/cross-binutils/powerpc64-unknown-eabi-binutils.install
new file mode 100644
index 000000000..2e3ca0474
--- /dev/null
+++ b/~coadde/cross-binutils/powerpc64-unknown-eabi-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=powerpc64-unknown-eabi-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/powerpc64-unknown-elf-binutils-multilib.install b/~coadde/cross-binutils/powerpc64-unknown-elf-binutils-multilib.install
new file mode 100644
index 000000000..4000bde4f
--- /dev/null
+++ b/~coadde/cross-binutils/powerpc64-unknown-elf-binutils-multilib.install
@@ -0,0 +1,16 @@
+_pkgname=powerpc64-unknown-elf-binutils-multilib
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/powerpc64-unknown-elf-binutils.install b/~coadde/cross-binutils/powerpc64-unknown-elf-binutils.install
new file mode 100644
index 000000000..f9d4ff394
--- /dev/null
+++ b/~coadde/cross-binutils/powerpc64-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=powerpc64-unknown-elf-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/powerpc64le-unknown-eabi-binutils-multilib.install b/~coadde/cross-binutils/powerpc64le-unknown-eabi-binutils-multilib.install
new file mode 100644
index 000000000..0b6f6c848
--- /dev/null
+++ b/~coadde/cross-binutils/powerpc64le-unknown-eabi-binutils-multilib.install
@@ -0,0 +1,16 @@
+_pkgname=powerpc64le-unknown-eabi-binutils-multilib
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/powerpc64le-unknown-eabi-binutils.install b/~coadde/cross-binutils/powerpc64le-unknown-eabi-binutils.install
new file mode 100644
index 000000000..3798f1bfe
--- /dev/null
+++ b/~coadde/cross-binutils/powerpc64le-unknown-eabi-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=powerpc64le-unknown-eabi-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/powerpc64le-unknown-elf-binutils-multilib.install b/~coadde/cross-binutils/powerpc64le-unknown-elf-binutils-multilib.install
new file mode 100644
index 000000000..1e30719bf
--- /dev/null
+++ b/~coadde/cross-binutils/powerpc64le-unknown-elf-binutils-multilib.install
@@ -0,0 +1,16 @@
+_pkgname=powerpc64le-unknown-elf-binutils-multilib
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/powerpc64le-unknown-elf-binutils.install b/~coadde/cross-binutils/powerpc64le-unknown-elf-binutils.install
new file mode 100644
index 000000000..891b7f85b
--- /dev/null
+++ b/~coadde/cross-binutils/powerpc64le-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=powerpc64le-unknown-elf-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/sh-unknown-elf-binutils.install b/~coadde/cross-binutils/sh-unknown-elf-binutils.install
new file mode 100644
index 000000000..20d123559
--- /dev/null
+++ b/~coadde/cross-binutils/sh-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=sh-unknown-elf-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/sh64-unknown-elf-binutils-multilib.install b/~coadde/cross-binutils/sh64-unknown-elf-binutils-multilib.install
new file mode 100644
index 000000000..1f11dabbb
--- /dev/null
+++ b/~coadde/cross-binutils/sh64-unknown-elf-binutils-multilib.install
@@ -0,0 +1,16 @@
+_pkgname=sh64-unknown-elf-binutils-multilib
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/sh64-unknown-elf-binutils.install b/~coadde/cross-binutils/sh64-unknown-elf-binutils.install
new file mode 100644
index 000000000..04ee63c8c
--- /dev/null
+++ b/~coadde/cross-binutils/sh64-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=sh64-unknown-elf-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/sh64l-unknown-elf-binutils-multilib.install b/~coadde/cross-binutils/sh64l-unknown-elf-binutils-multilib.install
new file mode 100644
index 000000000..6e01ac61e
--- /dev/null
+++ b/~coadde/cross-binutils/sh64l-unknown-elf-binutils-multilib.install
@@ -0,0 +1,16 @@
+_pkgname=sh64l-unknown-elf-binutils-multilib
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/sh64l-unknown-elf-binutils.install b/~coadde/cross-binutils/sh64l-unknown-elf-binutils.install
new file mode 100644
index 000000000..ab95b36ec
--- /dev/null
+++ b/~coadde/cross-binutils/sh64l-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=sh64l-unknown-elf-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/shl-unknown-elf-binutils.install b/~coadde/cross-binutils/shl-unknown-elf-binutils.install
new file mode 100644
index 000000000..cdb30916b
--- /dev/null
+++ b/~coadde/cross-binutils/shl-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=shl-unknown-elf-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/sparc64-unknown-linux-gnu-binutils-multilib.install b/~coadde/cross-binutils/sparc64-unknown-linux-gnu-binutils-multilib.install
new file mode 100644
index 000000000..d0aff2a85
--- /dev/null
+++ b/~coadde/cross-binutils/sparc64-unknown-linux-gnu-binutils-multilib.install
@@ -0,0 +1,16 @@
+_pkgname=sparc64-unknown-linux-gnu-binutils-multilib
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/sparc64-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/sparc64-unknown-linux-gnu-binutils.install
new file mode 100644
index 000000000..2d24404e5
--- /dev/null
+++ b/~coadde/cross-binutils/sparc64-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=sparc64-unknown-linux-gnu-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/x86_64-unknown-elf-binutils-multilib.install b/~coadde/cross-binutils/x86_64-unknown-elf-binutils-multilib.install
new file mode 100644
index 000000000..dcf66e30a
--- /dev/null
+++ b/~coadde/cross-binutils/x86_64-unknown-elf-binutils-multilib.install
@@ -0,0 +1,16 @@
+_pkgname=x86_64-unknown-elf-binutils-multilib
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/x86_64-unknown-elf-binutils.install b/~coadde/cross-binutils/x86_64-unknown-elf-binutils.install
new file mode 100644
index 000000000..779e65ab3
--- /dev/null
+++ b/~coadde/cross-binutils/x86_64-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=x86_64-unknown-elf-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/x86_64-unknown-gnu-binutils-multilib.install b/~coadde/cross-binutils/x86_64-unknown-gnu-binutils-multilib.install
new file mode 100644
index 000000000..7c682ba82
--- /dev/null
+++ b/~coadde/cross-binutils/x86_64-unknown-gnu-binutils-multilib.install
@@ -0,0 +1,16 @@
+_pkgname=x86_64-unknown-gnu-binutils-multilib
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/x86_64-unknown-gnu-binutils.install b/~coadde/cross-binutils/x86_64-unknown-gnu-binutils.install
new file mode 100644
index 000000000..102a11fd0
--- /dev/null
+++ b/~coadde/cross-binutils/x86_64-unknown-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=x86_64-unknown-gnu-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/x86_64-unknown-linux-gnu-binutils-multilib.install b/~coadde/cross-binutils/x86_64-unknown-linux-gnu-binutils-multilib.install
new file mode 100644
index 000000000..96140638c
--- /dev/null
+++ b/~coadde/cross-binutils/x86_64-unknown-linux-gnu-binutils-multilib.install
@@ -0,0 +1,16 @@
+_pkgname=x86_64-unknown-linux-gnu-binutils-multilib
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/x86_64-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/x86_64-unknown-linux-gnu-binutils.install
new file mode 100644
index 000000000..299a9675f
--- /dev/null
+++ b/~coadde/cross-binutils/x86_64-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=x86_64-unknown-linux-gnu-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/x86_64-unknown-uclinux-gnu-binutils-multilib.install b/~coadde/cross-binutils/x86_64-unknown-uclinux-gnu-binutils-multilib.install
new file mode 100644
index 000000000..69bbb9180
--- /dev/null
+++ b/~coadde/cross-binutils/x86_64-unknown-uclinux-gnu-binutils-multilib.install
@@ -0,0 +1,16 @@
+_pkgname=x86_64-unknown-uclinux-gnu-binutils-multilib
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/x86_64-unknown-uclinux-gnu-binutils.install b/~coadde/cross-binutils/x86_64-unknown-uclinux-gnu-binutils.install
new file mode 100644
index 000000000..0a16733a9
--- /dev/null
+++ b/~coadde/cross-binutils/x86_64-unknown-uclinux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=x86_64-unknown-uclinux-gnu-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/xtensa-unknown-elf-binutils-ath9k-htc.install b/~coadde/cross-binutils/xtensa-unknown-elf-binutils-ath9k-htc.install
new file mode 100644
index 000000000..643379261
--- /dev/null
+++ b/~coadde/cross-binutils/xtensa-unknown-elf-binutils-ath9k-htc.install
@@ -0,0 +1,16 @@
+_pkgname=xtensa-unknown-elf-binutils-ath9k-htc
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/xtensa-unknown-elf-binutils.install b/~coadde/cross-binutils/xtensa-unknown-elf-binutils.install
new file mode 100644
index 000000000..120b40b1b
--- /dev/null
+++ b/~coadde/cross-binutils/xtensa-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=xtensa-unknown-elf-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}