Merge branch 'master' of ssh://projects.parabolagnulinux.org:1863/srv/git/abslibre

62 files changed, 526 insertions, 534 deletions

diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index 562692e48..231268930 100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -9,8 +9,8 @@ pkgdesc="Programs for Parabola development"
 url="https://projects.parabolagnulinux.org/packages/libretools.git/"
 license=('GPL3' 'GPL2')
 
-pkgver=20130706
-_libretools_commit=de47a853ef515db2b9a775c235239efacd16041b
+pkgver=20130714
+_libretools_commit=bb42528084058af8dc42c315d5f013af05741bb1
 _devtools_commit=bf8513ae631484a0c292ad085ea7ede9859f8e0f
 
 _packages_url=https://projects.parabolagnulinux.org/packages
@@ -54,7 +54,7 @@ package_libretools() {
   depends=(
     "librelib=$pkgver"
     arch-install-scripts # `archroot` uses `pacstrap`
-    git # `createworkdir` (also mips-add in -mips64el)
+    git # `createworkdir` and `libregit` (also mips-add in -mips64el)
     openssh # `librerelease`
     rsync # `librerelease` and `makechrootpkg.sh`
     subversion # `diff-unfree`
@@ -74,5 +74,5 @@ package_libretools-mips64el() {
   make install-libretools-mips64el DESTDIR="$pkgdir"
 }
 
-md5sums=('f30fbc4011acdd9065310f8295267bdd'
+md5sums=('a8c4c3552bde5185dec637471b890256'
          'b28b1492fda205be7c577fc03cbc3399')
diff --git a/libre/parabolaweb-utils/PKGBUILD b/libre/parabolaweb-utils/PKGBUILD
index 4220394dc..2ab0c142e 100644
--- a/libre/parabolaweb-utils/PKGBUILD
+++ b/libre/parabolaweb-utils/PKGBUILD
@@ -6,47 +6,30 @@
 #  _get_depends_nover (no version requirements)
 
 pkgname=parabolaweb-utils
-pkgver=20120425.0657
-pkgdesc="Utils for the Parabola website"
-url="https://projects.parabolagnulinux.org/parabolaweb.git/"
+pkgver=20130714
+pkgdesc="Utilities for managing the parabolaweb website application"
+url="https://projects.parabolagnulinux.org/packages/parabolaweb-utils.git/"
 license=('GPL2')
 
 pkgrel=1
 epoch=1
 arch=('any')
-depends=(
-    'python2'      # duh
-    'python2-flup' # for fcgi
-    'postgresql'   # for database
-    'git'          # used in parabolaweb-download
-    'libretools'   # used in parabolaweb-{download,update} (libremessages)
-    `_get_depends`)
-conflicts=('django>=1.5') # hold it at 1.4
-makedepends=(makepkg-git)
 backup=('etc/conf.d/parabolaweb')
 
-source=(git://parabolagnulinux.org/parabolaweb.git
-	parabolaweb-download
-	parabolaweb-update
-	parabolaweb-fcgi
-	parabolaweb.rc
-	parabolaweb.service
-	parabolaweb.conf)
-
-pkgver() {
-	cd "$srcdir/parabolaweb"
-	# get the date requirements_prod.txt was last modified
-	gitdate="$(git log -n1 --date=iso --format=format:'%cd' ./requirements_prod.txt)"
-	date -u +%Y%m%d.%H%M -d "$gitdate"
-}
-
-build() {
-	:
-}
+if [[ -z $NODEPENDS ]]; then
+	list_depends="${srcdir:-src}/$pkgname-$pkgver/list-depends"
+	if ! [[ -f $list_depends ]]; then
+		NODEPENDS=true makepkg -o
+	fi
+	depends=($(
+		cd "${list_depends%/*}"
+		bash "${list_depends##*/}"
+	))
+fi
+source=("https://projects.parabolagnulinux.org/packages/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2")
 
 package() {
-	cd "${srcdir}"
-	install -Dm755 parabolaweb-download  "${pkgdir}/usr/sbin/parabolaweb-download"
+	cd "$srcdir/$pkgname-$pkgver"
 	install -Dm755 parabolaweb-update    "${pkgdir}/usr/sbin/parabolaweb-update"
 	install -Dm755 parabolaweb-fcgi      "${pkgdir}/usr/sbin/parabolaweb-fcgi"
 	install -Dm755 parabolaweb.rc        "${pkgdir}/etc/rc.d/parabolaweb"
@@ -54,10 +37,4 @@ package() {
 	install -Dm644 parabolaweb.conf      "${pkgdir}/etc/conf.d/parabolaweb"
 }
 
-md5sums=('SKIP'
-         'f162c2ce49b4cafe0a14bd4767dfea04'
-         '7c212024c134fdd0d0318b52a5448ddb'
-         'd5294495f42df29d29519ebd0a8f6093'
-         'cc15e153f99fba82e7bb032896f655c2'
-         'a468016a7155b5da46521dcfc6428384'
-         'ffd37a19b1a72fbac2c58504aa17b355')
+md5sums=('1c09dd63340cda8bb9ac12273a3b9008')
diff --git a/pcr/miniupnpd/PKGBUILD b/pcr/miniupnpd/PKGBUILD
index da6f373c9..e88427488 100644
--- a/pcr/miniupnpd/PKGBUILD
+++ b/pcr/miniupnpd/PKGBUILD
@@ -1,8 +1,8 @@
 # $Id$
 # Maintainer: fauno <fauno@parabola.nu>
 pkgname=miniupnpd
-pkgver=1.8.20130503
-pkgrel=3
+pkgver=1.8.20130607
+pkgrel=1
 pkgdesc="Lightweight UPnP IGD daemon"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://miniupnp.free.fr"
@@ -12,8 +12,6 @@ depends=('libnfnetlink' 'iptables>=1.4.3' 'net-tools')
 makedepends=('lsb-release')
 source=("http://miniupnp.free.fr/files/$pkgname-$pkgver.tar.gz"
         miniupnpd.systemd)
-md5sums=('484dbda7c428b2d5f3768500a48d3375'
-         '0c3f1777b6c043dd5029092d62896660')
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
@@ -41,5 +39,5 @@ package() {
         cd "$pkgdir"
         mv usr/sbin usr/bin
 }
-md5sums=('484dbda7c428b2d5f3768500a48d3375'
-         'f862f79b673359adc80faf0be914394f')
+md5sums=('55688b5eb5025095b1da49f841e62792'
+         '0c3f1777b6c043dd5029092d62896660')
diff --git a/pcr/smtube/PKGBUILD b/pcr/smtube/PKGBUILD
deleted file mode 100644
index d54983bb0..000000000
--- a/pcr/smtube/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: Guest One <theguestone at gmail dot com>
-pkgname=smtube
-pkgver=1.7
-pkgrel=1
-pkgdesc="Search and download videos from YouTube"
-arch=('i686' 'x86_64')
-url="http://smplayer.sourceforge.net"
-license=('GPL')
-depends=('qt4' 'smplayer')
-source=(http://downloads.sourceforge.net/smplayer/$pkgname-$pkgver.tar.bz2)
-
-md5sums=('d9a954e1b337f0c850dcfc6063255056')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make QMAKE=qmake-qt4 LRELEASE=lrelease-qt4 PREFIX="/usr"
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make QMAKE=qmake-qt4 LRELEASE=lrelease-qt4 PREFIX="/usr" DESTDIR="$pkgdir" install
-}
\ No newline at end of file
diff --git a/~coadde/cross-binutils/PKGBUILD b/~coadde/cross-binutils/PKGBUILD
index 5f322af4f..cb84cae3a 100644
--- a/~coadde/cross-binutils/PKGBUILD
+++ b/~coadde/cross-binutils/PKGBUILD
@@ -3,34 +3,57 @@
 
 # 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        |
-#+----------------+--------------------+
+# +-------------+-------------+-----------------------------------------------------------+-----------+---------+
+# | -march      | CARCH       | CHOST (_target)                                           | Multilib  | QEMU    |
+# +-------------+-------------+-------------+----------+----------------------------------+-----------+---------+
+# | _arch       | _CARCH      | _host       | _machine | _system (GNU/*)                  | _multilib | -       |
+# +-------------+-------------+-------------+----------+----------------------------------+-----------+---------+
+# | mips64el    | mips64el    | mips64el    | unknown  | linux-gnu|elf                    | yes       | sys     |
+# | mips64      | mips64      | mips64      | unknown  | linux-gnu|elf                    | yes       | sys     |
+# | *           | mipsel      | mipsel      | unknown  | elf                              | no        | bin/sys |
+# | *           | mips        | mips        | unknown  | elf                              | no        | bin/sys |
+# | x86_64      | x86_64      | x86_64      | unknown  | linux-gnu|gnu<|elf               | yes       | bin/sys |
+# | i[5-7]86    | i[5-7]86    | i[5-7]86    | pc       | linux-gnu|gnu|elf                | no        | bin/sys |
+# | *           | i486        | i486        | unknown  | elf                              | no        | bin/sys |
+# | *           | i386        | i386        | unknown  | elf                              | no        | bin/sys |
+# | armv8-a     | aarch64     | aarch64     | unknown  | linux-gnu|elf                    | yes       | -       |
+# | armv8-a     | aarch64_be  | aarch64_be  | unknown  | linux-gnu|elf                    | yes       | -       |
+# | armv7-a     | armv7h      | armv7l      | unknown  | linux-gnueabihf                  | no        | bin/sys |
+# | armv6       | armv6h      | armv6l      | unknown  | linux-gnueabihf                  | no        | bin/sys |
+# | armv5te     | arm         | armv5tel    | unknown  | linux-gnueabi                    | no        | bin/sys |
+# | *           | arm         | arm         | unknown  | eabi                             | no        | bin/sys |
+# | arm         | armeb       | armeb       | unknown  | linux-gnueabi|eabi               | no        | bin     |
+# | sparc64     | sparc64     | sparc64     | unknown  | linux-gnu                        | yes       | bin/sys |
+# | sparc       | sparc       | sparc       | unknown  | linux-gnu                        | no        | bin/sys |
+# | -           | ia64        | ia64        | unknown  | linux-gnu                        | yes       | -       |
+# | -           | s390        | s390        | unknown  | linux-gnu                        | no        | -       |
+# | -           | s390x       | s390x       | unknown  | linux-gnu                        | no        | bin/sys |
+# | powerpc64   | powerpc64   | powerpc64   | unknown  | linux-gnu|linux-gnueabi|elf|eabi | yes       | bin/sys |
+# | powerpc64le | powerpc64le | powerpc64le | unknown  | linux-gnu|linux-gnueabi|elf|eabi | yes       | -       |
+# | powerpc     | powerpc     | powerpc     | unknown  | linux-gnu|linux-gnueabi|elf|eabi | no        | bin/sys |
+# | powerpcle   | powerpcle   | powerpcle   | unknown  | linux-gnu|linux-gnueabi|elf|eabi | no        | -       |
+# | -           | spu         | spu         | unknown  | elf                              | no        | -       |
+# | -           | sh64        | sh64        | unknown  | linux-gnu|elf                    | yes       | -       |
+# | -           | sh64l       | sh64l       | unknown  | linux-gnu|elf                    | yes       | -       |
+# | -           | sh4         | sh4         | unknown  | linux-gnu                        | no        | bin/sys |
+# | -           | sh4l        | sh4l        | unknown  | linux-gnu                        | no        | bin/sys |
+# | -           | sh          | sh          | unknown  | elf                              | no        | - @     |
+# | -           | shl         | shl         | unknown  | elf                              | no        | - @     |
+# | -           | xtensa      | xtensa      | unknown  | elf                              | no        | sys     |
+# | *           | m68k        | m68k        | unknown  | elf                              | no        | bin/sys |
+# | -           | lm32        | lm32        | unknown  | linux-gnu|elf                    | no        | sys     |
+# | -           | or32        | or32        | unknown  | linux-gnu<|elf<                  | no        | bin/sys |
+# +-------------+-------------+-------------+----------+----------------------------------+-----------+---------+
+
+# * : Any supported by architecture.
+# - : None.
+# @ : bin/sys (Only sh4 and sh4l support)
+# < : I will support it. (future)
+
+_carch_list=('mips64el' 'mips64' 'x86_64' 'i786' 'i686' 'i586' 'i486' 'i386' 'aarch64' 'aarch64_be'
+             'armv7l' 'armv6l' 'armv5tel' 'armeb' 'sparc64' 'sparc' 'ia64' 's390' 's390x'
+             'powerpc64' 'powerpc64le' 'powerpc' 'powerpcle' 'sh64' 'sh64l' 'sh4' 'sh4l' 'lm32' 'or32')
+_multilib_list=('mips64el' 'mips64' 'x86_64' 'aarch64' 'aarch64_be' 'sparc64' 'ia64' 'powerpc64' 'powerpc64le''sh64' 'sh64l')
 
 #---------------------------------------------------------------------------------------------------------------------------------------------
 
@@ -38,8 +61,9 @@ _pkgname="binutils"
 
 ### Base FLAGS: ###
 _CARCH="x86_64"
-_os="unknown-linux-gnu"
-_target="${_CARCH}-${_os}"
+_host="${_CARCH}"
+_machine="unknown"
+_system="linux-gnu"
 _multilib="no"
 
 ### Patch FLAGS: ###
@@ -47,30 +71,16 @@ _patch_ath9k_htc_fw="no"
 
 #---------------------------------------------------------------------------------------------------------------------------------------------
 
+_target="${_host}-${_machine}-${_system}"
+
 # 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 _arch_multilib in ${_multilib_list[@]}; do
+  [[ ${_CARCH} != ${_arch_multilib} ]] && _multilib="no"
+done
 
 # For "_patch_ath9k_htc_fw"
 [[ ${_patch_ath9k_htc_fw} == "yes" ]] && {
@@ -88,7 +98,7 @@ pkgname=(
 )
 pkgver=2.23.2
 pkgrel=2
-arch=('i686' 'x86_64' 'mips64el')
+arch=("${_carch_list[@]}")
 url="http://www.gnu.org/software/${_pkgname}/"
 license=('GPL2')
 groups=('cross-devel')
@@ -132,16 +142,13 @@ 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
+  for _arch_multilib2 in ${_multilib_list[@]}; do
+    if [[ ${_CARCH} == ${_arch_multilib2} ]]; 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
+  done
 
   if [[ ${_multilib} == "yes" ]]; then
     _MULTILIB='--enable-multilib'
@@ -248,69 +255,64 @@ _target-binutils() {
 
 #---------------------------------------------------------------------------------------------------------------------------------------------
 
-# GNU/Linux-libre with GNU C Library (glibc)
+# GNU/Linux-libre
 package_mips64el-unknown-linux-gnu-binutils() { _target-binutils; }
 package_mips64el-unknown-linux-gnu-binutils-multilib() { _target-binutils; }
+package_mips64-unknown-linux-gnu-binutils() { _target-binutils; }
+package_mips64-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_i786-pc-linux-gnu-binutils() { _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_arm7l-unknown-linux-gnueabi-binutils() { _target-binutils; }
+package_arm6l-unknown-linux-gnueabi-binutils() { _target-binutils; }
+package_arm5tel-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_sparc-unknown-linux-gnu-binutils() { _target-binutils; }
 package_ia64-unknown-linux-gnu-binutils() { _target-binutils; }
 package_ia64-unknown-linux-gnu-binutils-multilib() { _target-binutils; }
+package_s390-unknown-linux-gnu-binutils() { _target-binutils; }
+package_s390x-unknown-linux-gnu-binutils() { _target-binutils; }
+package_sparc64-unknown-linux-gnu-binutils() { _target-binutils; }
+package_sparc64-unknown-linux-gnu-binutils-multilib() { _target-binutils; }
+package_powerpc64-unknown-linux-gnu-binutils() { _target-binutils; }
+package_powerpc64-unknown-linux-gnu-binutils-multilib() { _target-binutils; }
+package_powerpc64le-unknown-linux-gnu-binutils() { _target-binutils; }
+package_powerpc64le-unknown-linux-gnu-binutils-multilib() { _target-binutils; }
+package_powerpc-unknown-linux-gnu-binutils() { _target-binutils; }
+package_powerpcle-unknown-linux-gnu-binutils() { _target-binutils; }
+package_sh64-unknown-linux-gnu-binutils() { _target-binutils; }
+package_sh64-unknown-linux-gnu-binutils-multilib() { _target-binutils; }
+package_sh64l-unknown-linux-gnu-binutils() { _target-binutils; }
+package_sh64l-unknown-linux-gnu-binutils-multilib() { _target-binutils; }
+package_sh4-unknown-linux-gnu-binutils() { _target-binutils; }
+package_sh4l-unknown-linux-gnu-binutils() { _target-binutils; }
+package_lm32-unknown-linux-gnu-binutils() { _target-binutils; }
+package_or32-unknown-linux-gnu-binutils() { _target-binutils; }
 
 # GNU
 package_x86_64-unknown-gnu-binutils() { _target-binutils; }
 package_x86_64-unknown-gnu-binutils-multilib() { _target-binutils; }
+package_i786-pc-gnu-binutils() { _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_mipsel-unknown-elf-binutils() { _target-binutils; }
+package_mips-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; }
@@ -320,23 +322,28 @@ 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-elf-binutils() { _target-binutils; }
+package_powerpc64le-unknown-elf-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_powerpc-unknown-elf-binutils() { _target-binutils; }
+package_powerpc-unknown-eabi-binutils() { _target-binutils; }
+package_powerpcle-unknown-elf-binutils() { _target-binutils; }
+package_powerpcle-unknown-eabi-binutils() { _target-binutils; }
+package_spu-unknown-elf-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_xtensa-unknown-elf-binutils() { _target-binutils; }
+package_xtensa-unknown-elf-binutils-ath9k_htc() { _target-binutils; }
 package_m68k-unknown-elf-binutils() { _target-binutils; }
+package_lm32-unknown-elf-binutils() { _target-binutils; }
+package_or32-unknown-elf-binutils() { _target-binutils; }
 
 #---------------------------------------------------------------------------------------------------------------------------------------------
 
diff --git a/~coadde/cross-binutils/aarch64-unknown-uclinux-gnu-binutils-multilib.install b/~coadde/cross-binutils/aarch64-unknown-uclinux-gnu-binutils-multilib.install
deleted file mode 100644
index 0420b342a..000000000
--- a/~coadde/cross-binutils/aarch64-unknown-uclinux-gnu-binutils-multilib.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_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_be-unknown-uclinux-gnu-binutils-multilib.install b/~coadde/cross-binutils/aarch64_be-unknown-uclinux-gnu-binutils-multilib.install
deleted file mode 100644
index 8ecd22ed1..000000000
--- a/~coadde/cross-binutils/aarch64_be-unknown-uclinux-gnu-binutils-multilib.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_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/armeb-unknown-uclinux-gnueabi.install b/~coadde/cross-binutils/arm5tel-unknown-linux-gnueabi.install
index b44e358f1..f1053cd1e 100644
--- a/~coadde/cross-binutils/armeb-unknown-uclinux-gnueabi.install
+++ b/~coadde/cross-binutils/arm5tel-unknown-linux-gnueabi.install
@@ -1,4 +1,4 @@
-_pkgname=armeb-unknown-uclinux-gnueabi-binutils
+_pkgname=arm5tel-unknown-linux-gnueabi-binutils
 
 post_install() {
   linktools set $_pkgname
diff --git a/~coadde/cross-binutils/armv5-unknown-linux-gnueabi.install b/~coadde/cross-binutils/arm6l-unknown-linux-gnueabi.install
index afdc1ebc8..fa11d3f92 100644
--- a/~coadde/cross-binutils/armv5-unknown-linux-gnueabi.install
+++ b/~coadde/cross-binutils/arm6l-unknown-linux-gnueabi.install
@@ -1,4 +1,4 @@
-_pkgname=armv5-unknown-linux-gnueabi-binutils
+_pkgname=arm6l-unknown-linux-gnueabi-binutils
 
 post_install() {
   linktools set $_pkgname
diff --git a/~coadde/cross-binutils/arm-unknown-uclinux-gnueabi.install b/~coadde/cross-binutils/arm7l-unknown-linux-gnueabi.install
index e7cee926c..4e9ca080f 100644
--- a/~coadde/cross-binutils/arm-unknown-uclinux-gnueabi.install
+++ b/~coadde/cross-binutils/arm7l-unknown-linux-gnueabi.install
@@ -1,4 +1,4 @@
-_pkgname=arm-unknown-uclinux-gnueabi-binutils
+_pkgname=arm7l-unknown-linux-gnueabi-binutils
 
 post_install() {
   linktools set $_pkgname
diff --git a/~coadde/cross-binutils/armv5-unknown-uclinux-gnueabi.install b/~coadde/cross-binutils/armv5-unknown-uclinux-gnueabi.install
deleted file mode 100644
index 69faa8902..000000000
--- a/~coadde/cross-binutils/armv5-unknown-uclinux-gnueabi.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_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
deleted file mode 100644
index 1b92d60a0..000000000
--- a/~coadde/cross-binutils/armv5eb-unknown-linux-gnueabi.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_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
deleted file mode 100644
index 3370ab5b5..000000000
--- a/~coadde/cross-binutils/armv5eb-unknown-uclinux-gnueabi.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_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
deleted file mode 100644
index b5dcd7d38..000000000
--- a/~coadde/cross-binutils/armv6-unknown-linux-gnueabi.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_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
deleted file mode 100644
index 63169847e..000000000
--- a/~coadde/cross-binutils/armv6-unknown-uclinux-gnueabi.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_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
deleted file mode 100644
index 72ea5a267..000000000
--- a/~coadde/cross-binutils/armv6eb-unknown-linux-gnueabi.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_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
deleted file mode 100644
index ba95c1b5d..000000000
--- a/~coadde/cross-binutils/armv6eb-unknown-uclinux-gnueabi.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_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
deleted file mode 100644
index b0cadf5af..000000000
--- a/~coadde/cross-binutils/armv7-unknown-linux-gnueabi.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_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
deleted file mode 100644
index 42f2d1cea..000000000
--- a/~coadde/cross-binutils/armv7-unknown-uclinux-gnueabi.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_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
deleted file mode 100644
index b4510863d..000000000
--- a/~coadde/cross-binutils/armv7eb-unknown-linux-gnueabi.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_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
deleted file mode 100644
index faa3e3b77..000000000
--- a/~coadde/cross-binutils/armv7eb-unknown-uclinux-gnueabi.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_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/~coadde/cross-binutils/i586-unknown-elf-binutils.install b/~coadde/cross-binutils/i786-pc-gnu-binutils.install
index 4c55c2c6e..f77927c8d 100644
--- a/~coadde/cross-binutils/i586-unknown-elf-binutils.install
+++ b/~coadde/cross-binutils/i786-pc-gnu-binutils.install
@@ -1,4 +1,4 @@
-_pkgname=i586-unknown-elf-binutils
+_pkgname=i786-pc-gnu-binutils
 
 post_install() {
   linktools set $_pkgname
diff --git a/~coadde/cross-binutils/mips32-unknown-elf-binutils.install b/~coadde/cross-binutils/i786-pc-linux-gnu-binutils.install
index c16855af8..b6422d2ce 100644
--- a/~coadde/cross-binutils/mips32-unknown-elf-binutils.install
+++ b/~coadde/cross-binutils/i786-pc-linux-gnu-binutils.install
@@ -1,4 +1,4 @@
-_pkgname=mips32-unknown-elf-binutils
+_pkgname=i786-pc-linux-gnu-binutils
 
 post_install() {
   linktools set $_pkgname
diff --git a/~coadde/cross-binutils/i686-unknown-elf-binutils.install b/~coadde/cross-binutils/lm32-unknown-elf-binutils.install
index f92849138..c2481ba1f 100644
--- a/~coadde/cross-binutils/i686-unknown-elf-binutils.install
+++ b/~coadde/cross-binutils/lm32-unknown-elf-binutils.install
@@ -1,4 +1,4 @@
-_pkgname=i686-unknown-elf-binutils
+_pkgname=lm32-unknown-elf-binutils
 
 post_install() {
   linktools set $_pkgname
diff --git a/~coadde/cross-binutils/lm32-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/lm32-unknown-linux-gnu-binutils.install
new file mode 100644
index 000000000..e59746dd4
--- /dev/null
+++ b/~coadde/cross-binutils/lm32-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=lm32-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/i686-pc-uclinux-gnu-binutils.install b/~coadde/cross-binutils/mips-unknown-elf-binutils.install
index 04ece7396..f8dd9a4ad 100644
--- a/~coadde/cross-binutils/i686-pc-uclinux-gnu-binutils.install
+++ b/~coadde/cross-binutils/mips-unknown-elf-binutils.install
@@ -1,4 +1,4 @@
-_pkgname=i686-pc-uclinux-gnu-binutils
+_pkgname=mips-unknown-elf-binutils
 
 post_install() {
   linktools set $_pkgname
diff --git a/~coadde/cross-binutils/mips32el-unknown-elf-binutils.install b/~coadde/cross-binutils/mips32el-unknown-elf-binutils.install
deleted file mode 100644
index 83ef0456f..000000000
--- a/~coadde/cross-binutils/mips32el-unknown-elf-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_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-linux-gnu-binutils-multilib.install b/~coadde/cross-binutils/mips64-unknown-linux-gnu-binutils-multilib.install
new file mode 100644
index 000000000..7ae20c93c
--- /dev/null
+++ b/~coadde/cross-binutils/mips64-unknown-linux-gnu-binutils-multilib.install
@@ -0,0 +1,16 @@
+_pkgname=mips64-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/mips64-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/mips64-unknown-linux-gnu-binutils.install
new file mode 100644
index 000000000..3da7b37e3
--- /dev/null
+++ b/~coadde/cross-binutils/mips64-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=mips64-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
deleted file mode 100644
index b633641d5..000000000
--- a/~coadde/cross-binutils/mips64el-unknown-uclinux-gnu-binutils-multilib.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_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
deleted file mode 100644
index 29094da95..000000000
--- a/~coadde/cross-binutils/mips64el-unknown-uclinux-gnu-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_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/mipsel-unknown-elf-binutils.install b/~coadde/cross-binutils/mipsel-unknown-elf-binutils.install
new file mode 100644
index 000000000..87c99efcf
--- /dev/null
+++ b/~coadde/cross-binutils/mipsel-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=mipsel-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/or32-unknown-elf-binutils.install b/~coadde/cross-binutils/or32-unknown-elf-binutils.install
new file mode 100644
index 000000000..92833bd5d
--- /dev/null
+++ b/~coadde/cross-binutils/or32-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=or32-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/or32-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/or32-unknown-linux-gnu-binutils.install
new file mode 100644
index 000000000..8427c5c91
--- /dev/null
+++ b/~coadde/cross-binutils/or32-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=or32-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/powerpc-unknown-eabi-binutils.install b/~coadde/cross-binutils/powerpc-unknown-eabi-binutils.install
new file mode 100644
index 000000000..eed9a2c98
--- /dev/null
+++ b/~coadde/cross-binutils/powerpc-unknown-eabi-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=powerpc-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/i586-pc-uclinux-gnu-binutils.install b/~coadde/cross-binutils/powerpc-unknown-elf-binutils.install
index 2729ec574..fbd5f0556 100644
--- a/~coadde/cross-binutils/i586-pc-uclinux-gnu-binutils.install
+++ b/~coadde/cross-binutils/powerpc-unknown-elf-binutils.install
@@ -1,4 +1,4 @@
-_pkgname=i586-pc-uclinux-gnu-binutils
+_pkgname=powerpc-unknown-elf-binutils
 
 post_install() {
   linktools set $_pkgname
diff --git a/~coadde/cross-binutils/arm-unknown-linux-gnueabi.install b/~coadde/cross-binutils/powerpc-unknown-linux-gnu-binutils.install
index 011cd2ae3..b7e544e48 100644
--- a/~coadde/cross-binutils/arm-unknown-linux-gnueabi.install
+++ b/~coadde/cross-binutils/powerpc-unknown-linux-gnu-binutils.install
@@ -1,4 +1,4 @@
-_pkgname=arm-unknown-linux-gnueabi-binutils
+_pkgname=powerpc-unknown-linux-gnu-binutils
 
 post_install() {
   linktools set $_pkgname
diff --git a/~coadde/cross-binutils/powerpc-unknown-linux-gnueabi-binutils.install b/~coadde/cross-binutils/powerpc-unknown-linux-gnueabi-binutils.install
new file mode 100644
index 000000000..5667c84e2
--- /dev/null
+++ b/~coadde/cross-binutils/powerpc-unknown-linux-gnueabi-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=powerpc-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/powerpc32-unknown-eabi-binutils.install b/~coadde/cross-binutils/powerpc32-unknown-eabi-binutils.install
deleted file mode 100644
index 6db625881..000000000
--- a/~coadde/cross-binutils/powerpc32-unknown-eabi-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_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
deleted file mode 100644
index dcc691e53..000000000
--- a/~coadde/cross-binutils/powerpc32-unknown-elf-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_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
deleted file mode 100644
index dd55db2d7..000000000
--- a/~coadde/cross-binutils/powerpc32le-unknown-eabi-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_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
deleted file mode 100644
index d304b6799..000000000
--- a/~coadde/cross-binutils/powerpc32le-unknown-elf-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_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/aarch64-unknown-uclinux-gnu-binutils.install b/~coadde/cross-binutils/powerpc64-unknown-linux-gnu-binutils.install
index fa1e49875..15a8c37c5 100644
--- a/~coadde/cross-binutils/aarch64-unknown-uclinux-gnu-binutils.install
+++ b/~coadde/cross-binutils/powerpc64-unknown-linux-gnu-binutils.install
@@ -1,4 +1,4 @@
-_pkgname=aarch64-unknown-uclinux-gnu-binutils
+_pkgname=powerpc64-unknown-linux-gnu-binutils
 
 post_install() {
   linktools set $_pkgname
diff --git a/~coadde/cross-binutils/aarch64_be-unknown-uclinux-gnu-binutils.install b/~coadde/cross-binutils/powerpc64-unknown-linux-gnueabi-binutils.install
index 017efb727..28e4914c6 100644
--- a/~coadde/cross-binutils/aarch64_be-unknown-uclinux-gnu-binutils.install
+++ b/~coadde/cross-binutils/powerpc64-unknown-linux-gnueabi-binutils.install
@@ -1,4 +1,4 @@
-_pkgname=aarch64_be-unknown-uclinux-gnu-binutils
+_pkgname=powerpc64-unknown-linux-gnueabi-binutils
 
 post_install() {
   linktools set $_pkgname
diff --git a/~coadde/cross-binutils/powerpc64le-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/powerpc64le-unknown-linux-gnu-binutils.install
new file mode 100644
index 000000000..f8872d8e1
--- /dev/null
+++ b/~coadde/cross-binutils/powerpc64le-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=powerpc64le-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/powerpc64le-unknown-linux-gnueabi-binutils.install b/~coadde/cross-binutils/powerpc64le-unknown-linux-gnueabi-binutils.install
new file mode 100644
index 000000000..ae20ca33c
--- /dev/null
+++ b/~coadde/cross-binutils/powerpc64le-unknown-linux-gnueabi-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=powerpc64le-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/powerpcle-unknown-eabi-binutils.install b/~coadde/cross-binutils/powerpcle-unknown-eabi-binutils.install
new file mode 100644
index 000000000..850610fc6
--- /dev/null
+++ b/~coadde/cross-binutils/powerpcle-unknown-eabi-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=powerpcle-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/powerpcle-unknown-elf-binutils.install b/~coadde/cross-binutils/powerpcle-unknown-elf-binutils.install
new file mode 100644
index 000000000..24e07a7ec
--- /dev/null
+++ b/~coadde/cross-binutils/powerpcle-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=powerpcle-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/powerpcle-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/powerpcle-unknown-linux-gnu-binutils.install
new file mode 100644
index 000000000..b681acc4b
--- /dev/null
+++ b/~coadde/cross-binutils/powerpcle-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=powerpcle-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/powerpcle-unknown-linux-gnueabi-binutils.install b/~coadde/cross-binutils/powerpcle-unknown-linux-gnueabi-binutils.install
new file mode 100644
index 000000000..6559cdd29
--- /dev/null
+++ b/~coadde/cross-binutils/powerpcle-unknown-linux-gnueabi-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=powerpcle-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/s390-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/s390-unknown-linux-gnu-binutils.install
new file mode 100644
index 000000000..0a583f543
--- /dev/null
+++ b/~coadde/cross-binutils/s390-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=s390-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/s390x-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/s390x-unknown-linux-gnu-binutils.install
new file mode 100644
index 000000000..dc576d75e
--- /dev/null
+++ b/~coadde/cross-binutils/s390x-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=s390x-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/sh4-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/sh4-unknown-linux-gnu-binutils.install
new file mode 100644
index 000000000..5843ac274
--- /dev/null
+++ b/~coadde/cross-binutils/sh4-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=sh4-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/sh4l-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/sh4l-unknown-linux-gnu-binutils.install
new file mode 100644
index 000000000..f97168df0
--- /dev/null
+++ b/~coadde/cross-binutils/sh4l-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=sh4l-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/sh64-unknown-linux-gnu-binutils-multilib.install b/~coadde/cross-binutils/sh64-unknown-linux-gnu-binutils-multilib.install
new file mode 100644
index 000000000..451eedb44
--- /dev/null
+++ b/~coadde/cross-binutils/sh64-unknown-linux-gnu-binutils-multilib.install
@@ -0,0 +1,16 @@
+_pkgname=sh64-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/sh64-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/sh64-unknown-linux-gnu-binutils.install
new file mode 100644
index 000000000..2af6a7268
--- /dev/null
+++ b/~coadde/cross-binutils/sh64-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=sh64-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/sh64l-unknown-linux-gnu-binutils-multilib.install b/~coadde/cross-binutils/sh64l-unknown-linux-gnu-binutils-multilib.install
new file mode 100644
index 000000000..71c191e1c
--- /dev/null
+++ b/~coadde/cross-binutils/sh64l-unknown-linux-gnu-binutils-multilib.install
@@ -0,0 +1,16 @@
+_pkgname=sh64l-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/sh64l-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/sh64l-unknown-linux-gnu-binutils.install
new file mode 100644
index 000000000..cbe5c788a
--- /dev/null
+++ b/~coadde/cross-binutils/sh64l-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=sh64l-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/sparc-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/sparc-unknown-linux-gnu-binutils.install
new file mode 100644
index 000000000..f3dfca2d3
--- /dev/null
+++ b/~coadde/cross-binutils/sparc-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=sparc-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/spu-unknown-elf-binutils.install b/~coadde/cross-binutils/spu-unknown-elf-binutils.install
new file mode 100644
index 000000000..204d4bfb2
--- /dev/null
+++ b/~coadde/cross-binutils/spu-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=spu-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-uclinux-gnu-binutils-multilib.install b/~coadde/cross-binutils/x86_64-unknown-uclinux-gnu-binutils-multilib.install
deleted file mode 100644
index 69bbb9180..000000000
--- a/~coadde/cross-binutils/x86_64-unknown-uclinux-gnu-binutils-multilib.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_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
deleted file mode 100644
index 0a16733a9..000000000
--- a/~coadde/cross-binutils/x86_64-unknown-uclinux-gnu-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_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
-  }
-}