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

52 files changed, 764 insertions, 2130 deletions

diff --git a/java/not-working/closure-compiler/PKGBUILD b/java/not-working/closure-compiler/PKGBUILD
deleted file mode 100644
index 8318379a2..000000000
--- a/java/not-working/closure-compiler/PKGBUILD
+++ /dev/null
@@ -1,73 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-pkgname=closure-compiler
-pkgver=20120917
-_pkgrev=2180
-pkgdesc="A JavaScript optimizing compiler."
-url="https://code.google.com/closure/compiler/"
-license=('Apache')
-
-pkgrel=1
-arch=('any')
-depends=('java-runtime')
-makedepends=(
-  'apache-ant'
-  'java-args4j' # does not exist
-  'google-caja' # does not exist
-  'java-guava' # does not build
-  'java-jarjar'
-  'java-json' # does not exist
-  'java-jsr305' # does not exist
-  'junit'
-  'java-protobuf' # does not build
-  # maven-ant-tasks
-  'jh')
-source=("compiler-$pkgver::svn+http://closure-compiler.googlecode.com/svn/trunk/#revision=$_pkgrev")
-
-# For some reason, `file` detects this as a Fortran binary
-_funny_js=(
-  lib/rhino/testsrc/benchmarks/sunspider-0.9.1/bitops-3bit-bits-in-byte.js
-)
-
-mksource() {
-  cd "$srcdir/compiler-$pkgver"
-  rm lib/ant.jar
-  rm lib/ant-launcher.jar
-  rm lib/args4j.jar
-  rm lib/caja-r4314.jar
-  rm lib/guava.jar
-  rm lib/jarjar.jar
-  rm lib/json.jar
-  rm lib/jsr305.jar
-  rm lib/junit.jar
-  rm lib/protobuf-java.jar
-  rm lib/rhino/testsrc/org/mozilla/javascript/tests/commonjs/module/modules.jar
-  rm tools/maven-ant-tasks-2.1.3.jar
-}
-
-build() {
-  cd "$srcdir/compiler-$pkgver"
-  eval `jh mksource ${_funny_js[@]}`
-
-  ln -s /opt/apache-ant/lib/ant.jar          lib/ant.jar
-  ln -s /opt/apache-ant/lib/ant-launcher.jar lib/ant-launcher.jar
-  ln -s /usr/share/java/...                  lib/args4j.jar
-  ln -s /usr/share/java/...                  lib/caja-r4314.jar
-  ln -s /usr/share/java/...                  lib/guava.jar
-  ln -s /usr/share/java/jarjar.jar           lib/jarjar.jar
-  ln -s /usr/share/java/...                  lib/json.jar
-  ln -s /usr/share/java/...                  lib/jsr305.jar
-  ln -s /usr/share/java/junit.jar            lib/junit.jar
-  ln -s /usr/share/java/protobuf.jar         lib/protobuf-java.jar
-  # I think lib/rhino/.../module.jar autogenerates
-  ln -s /...                                 tools/maven-ant-tasks-2.1.3.jar
-
-  ant jar
-}
-
-package() {
-  cd "$srcdir/$pkgname"
-  :
-}
-
-md5sums=('SKIP')
diff --git a/java/not-working/closure-compiler/TODO b/java/not-working/closure-compiler/TODO
deleted file mode 100644
index 8527a4898..000000000
--- a/java/not-working/closure-compiler/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-* Has plenty of missing dependencies (most of the 'not-working' folder)
-* package() has not been written
diff --git a/java/not-working/java-asm4/PKGBUILD b/java/not-working/java-asm4/PKGBUILD
deleted file mode 100644
index 3db06dddc..000000000
--- a/java/not-working/java-asm4/PKGBUILD
+++ /dev/null
@@ -1,17 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-pkgver=4.1
-. ../java-asm2/common.sh
-depends+=('java-bnd')
-
-####
-
-pkgrel=5
-_checksource_ignore=(src/org/objectweb/asm/optimizer/jdk{1.2.2_017,1.3.1_19}.txt.gz)
-
-mksource() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  rm examples/jasmin/test/jasmin.jar
-}
-
-md5sums=('cbfd7445edc517e0867ad410e48cb106')
diff --git a/java/not-working/java-asm4/TODO b/java/not-working/java-asm4/TODO
deleted file mode 100644
index 563c88bc9..000000000
--- a/java/not-working/java-asm4/TODO
+++ /dev/null
@@ -1 +0,0 @@
-Depends on java-bnd, which is not packaged
\ No newline at end of file
diff --git a/java/not-working/java-guava/PKGBUILD b/java/not-working/java-guava/PKGBUILD
deleted file mode 100644
index 0250e7183..000000000
--- a/java/not-working/java-guava/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-_pkgname=guava
-pkgname=java-guava
-pkgver=13.0.1
-pkgdesc="Google Core Libraries for Java."
-url="https://code.google.com/p/guava-libraries/"
-license=('Apache2')
-
-pkgrel=1
-arch=('any')
-depends=('java-runtime>=5')
-makedepends=('java-runtime>=6' 'maven' 'junit-truth' 'jh')
-conflicts=('openjdk6') # OpenJDK bug 100167 conflicts
-source=("$pkgname::git+https://code.google.com/p/guava-libraries/#tag=v$pkgver")
-
-mksource() {
-  cd "$srcdir/$pkgname"
-  rm guava/lib/*.jar
-  rm guava-test/lib/*.jar
-}
-
-build() {
-  cd "$srcdir/$pkgname"
-  eval `jh mksource`
-
-  ln -s /usr/share/java/junit-truth.jar guava-tests/lib/libtruth.java
-
-  mvn package
-}
-
-package() {
-    :
-}
diff --git a/java/not-working/java-guava/TODO b/java/not-working/java-guava/TODO
deleted file mode 100644
index ee0a18042..000000000
--- a/java/not-working/java-guava/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-* depends on junit-truth, which does not build yet
-* package() hasn't been written
diff --git a/java/not-working/junit-truth/PKGBUILD b/java/not-working/junit-truth/PKGBUILD
deleted file mode 100644
index 61a0ee469..000000000
--- a/java/not-working/junit-truth/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-pkgname=junit-truth
-pkgdesc="Assertion/Proposition framework for Java unit tests."
-url="https://github.com/truth0/truth"
-license=('Apache2')
-
-#_pkgver=0.5.0-beta1
-#pkgver=${_pkgver//-/.}
-#_tag=v${_pkgver}
-
-#pkgver=0.7.0
-#_tag=truth-rel-${pkgver//./-}
-
-#pkgver=0.8
-#_tag=truth-${pkgver}
-
-#pkgver=0.9
-#_tag=release_${pkgver//./_}
-
-pkgver=0.10
-_tag=release_${pkgver//./_}
-
-pkgrel=1
-arch=('any')
-depends=('junit')
-makedepends=('maven' 'jh')
-conflicts=('openjdk6') # OpenJDK bug 100167 conflicts
-source=("$pkgname::git://github.com/truth0/truth.git#tag=$tag")
-
-build() {
-  cd "${srcdir}/${pkgname}"
-  jh checksource
-  mvn package
-}
-
-package() {
-  cd "${srcdir}/${pkgname}"
-  install -d "${pkgdir}"/usr/share/java/${pkgname}
-  JAR=${pkgname}-${pkgver}.jar
-  install -Dm 644 target/${JAR} "${pkgdir}"/usr/share/java/${pkgname}
-  ln -s       ${pkgname}/${JAR} "${pkgdir}"/usr/share/java/${pkgname}.jar
-}
-
-md5sums=('SKIP')
diff --git a/java/not-working/junit-truth/TODO b/java/not-working/junit-truth/TODO
deleted file mode 100644
index d21b3e472..000000000
--- a/java/not-working/junit-truth/TODO
+++ /dev/null
@@ -1 +0,0 @@
-has unpackaged dependencies
diff --git a/java/not-working/protobuf/PKGBUILD b/java/not-working/protobuf/PKGBUILD
deleted file mode 100644
index 699bde0cf..000000000
--- a/java/not-working/protobuf/PKGBUILD
+++ /dev/null
@@ -1,99 +0,0 @@
-# Maintainer: Thomas S Hatch <thatch45@gmail.com>
-# Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgbase=protobuf
-pkgname=('protobuf' 'python2-protobuf' 'java-protobuf')
-pkgver=2.4.1
-pkgrel=2.1
-pkgdesc="A way of encoding structured data in an efficient yet extensible format"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/protobuf/"
-license=('APACHE')
-depends=('gcc-libs' 'zlib')
-makedepends=('python2' 'python2-distribute' 'java-environment')
-options=(!libtool)
-source=(http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.bz2)
-md5sums=('ed436802019c9e1f40cc750eaf78f318')
-
-####
-
-build() {
-  build_protobuf
-  build_python2-protobuf
-  build_java-protobuf
-}
-
-check() {
-  check_protobuf
-  check_python2-protobuf
-  check_java-protobuf
-}
-
-package() {
-  package_protobuf
-  package_python2-protobuf
-  package_java-protobuf
-}
-
-####
-
-build_protobuf() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-check_protobuf() {
-  cd $srcdir/$pkgname-$pkgver
-  make check
-}
-
-package_protobuf() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-}
-
-####
-
-build_python2-protobuf() {
-  cd $srcdir/$pkgname-$pkgver/python
-  python2 setup.py build
-}
-
-check_python2-protobuf() {
-  cd $srcdir/$pkgname-$pkgver/python
-  python2 setup.py test
-}
-
-package_python2-protobuf() {
-  pkgdesc="protobuf python2 API"
-  replaces=('protobuf-python')
-  provides=("protobuf-python=${pkgver}")
-  depends=("python2" "protobuf=${pkgver}")
-
-  cd $srcdir/protobuf-$pkgver/python
-  python2 setup.py install --prefix=/usr --root $pkgdir
-}
-
-####
-
-build_java-protobuf() {
-  cd $srcdir/$pkgname-$pkgver/java
-  mvn compile
-}
-
-check_java-protobuf() {
-  cd $srcdir/$pkgname-$pkgver/java
-  mvn test
-}
-
-package_java-protobuf() {
-  pkgdesc="protobuf Java API"
-  replaces=('protobuf-java')
-  provides=("protobuf-java=${pkgver}")
-  depends=("java-runtime" "protobuf=${pkgver}")
-
-  cd $srcdir/$pkgname-$pkgver/java
-  :
-}
diff --git a/java/not-working/protobuf/TODO b/java/not-working/protobuf/TODO
deleted file mode 100644
index 6a126b757..000000000
--- a/java/not-working/protobuf/TODO
+++ /dev/null
@@ -1,5 +0,0 @@
-* Missing dependencies:
- * junit:junit:4.4 (4.10 is packaged, patch to use 4.10?)
- * org.easymock:easymock:2.2
- * org.easymock:easymockclassextension:2.2.1
-* package_java-protobuf() has not been written
diff --git a/libre/parabola-keyring/PKGBUILD b/libre/parabola-keyring/PKGBUILD
index d2c38b7d6..af130b5c0 100644
--- a/libre/parabola-keyring/PKGBUILD
+++ b/libre/parabola-keyring/PKGBUILD
@@ -8,11 +8,10 @@ arch=('any')
 url='https://projects.parabolagnulinux.org/hackers.git/'
 license=('GPL')
 install="${pkgname}.install"
-source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz"
-        "http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz.sig")
+source=(http://repo.parabolagnulinux.org/other/parabola-keyring-20130221.tar.gz{,.sig})
 
 package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
+	cd "${srcdir}/${pkgname}-"*
 	make PREFIX=/usr DESTDIR=${pkgdir} install
 }
 md5sums=('007c35459478f86484f66323bf90b1e0'
diff --git a/libre/xtensa-unknown-elf-binutils/PKGBUILD b/libre/xtensa-unknown-elf-binutils/PKGBUILD
index 8527a057d..2e29d1ff4 100644
--- a/libre/xtensa-unknown-elf-binutils/PKGBUILD
+++ b/libre/xtensa-unknown-elf-binutils/PKGBUILD
@@ -5,11 +5,11 @@
 
 _pkgname=binutils
 _target="xtensa-unknown-elf"
-_sysroot="/usr/${_target}"
+_sysroot="/usr/$CHOST/${_target}"
 
 pkgname=${_target}-binutils
 pkgver=2.23.2
-pkgrel=2.1
+pkgrel=2.3
 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/"
@@ -48,9 +48,8 @@ build() {
     --with-bugurl=https://labs.parabola.nu/ \
     --enable-ld=default --enable-gold \
     --enable-plugins --enable-threads \
-    --with-pic --disable-shared \
+    --with-pic --enable-shared \
     --disable-werror --disable-multilib \
-    --with-sysroot=${_sysroot} \
     --target=${_target}
 
   # check the host environment and makes sure all the necessary tools are available
diff --git a/libre/xtensa-unknown-elf-gcc/PKGBUILD b/libre/xtensa-unknown-elf-gcc/PKGBUILD
index 5472ba164..6081151b7 100644
--- a/libre/xtensa-unknown-elf-gcc/PKGBUILD
+++ b/libre/xtensa-unknown-elf-gcc/PKGBUILD
@@ -5,9 +5,9 @@
 
 _pkgname=gcc
 _target="xtensa-unknown-elf"
-_sysroot="/usr/${_target}"
+_sysroot="/usr/$CHOST/${_target}"
 
-pkgname="${_target}-gcc
+pkgname=${_target}-gcc
 pkgver=4.8.1
 pkgrel=1
 #_snapshot=4.8-20130502
@@ -15,7 +15,7 @@ pkgdesc="The GNU Compiler Collection for Xtensa processors"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL' 'custom')
 url="http://gcc.gnu.org"
-makedepends=("${_target}-binutils>=2.23" 'libmpc' 'cloog' 'gcc-ada' 'doxygen')
+makedepends=("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)
@@ -54,26 +54,31 @@ build() {
   CFLAGS=${CFLAGS/-pipe/}
   CXXFLAGS=${CXXFLAGS/-pipe/}
 
-  ${srcdir}/${_basedir}/configure --prefix=/usr \
-      --libdir=/usr/lib --libexecdir=/usr/lib \
-      --mandir=/usr/share/man --infodir=/usr/share/info \
-      --with-bugurl=https://labs.parabola.nu/ \
+  LD_LIBRARY_PATH=/usr/lib ${srcdir}/${_basedir}/configure --prefix=/usr \
+      --disable-shared --disable-threads --disable-multilib \
       --enable-languages=c \
-      --disable-shared --enable-threads=posix \
-      --with-system-zlib --enable-__cxa_atexit \
-      --disable-libunwind-exceptions --enable-clocale=gnu \
-      --disable-libstdcxx-pch \
-      --enable-gnu-unique-object --enable-linker-build-id \
-      --enable-cloog-backend=isl --disable-cloog-version-check \
-      --enable-lto --enable-gold --enable-ld=default \
-      --enable-plugin --with-plugin-ld=ld.gold \
-      --with-linker-hash-style=gnu --disable-install-libiberty \
-      --disable-multilib --disable-libssp --disable-werror \
-      --enable-checking=release \
-      --target=${_target} \
-      --with-sysroot=${_sysroot} \
-      --with-arch=xtensa \
-      --with-newlib
+      --disable-nls \
+      --target=$_target
+#      --build=x86_64-unknown-linux-gnu \
+#      --without-headers \
+#      --disable-multilib --disable-libssp --disable-werror \
+#      --libdir=/usr/lib --libexecdir=/usr/lib \
+#      --mandir=/usr/share/man --infodir=/usr/share/info \
+#      --with-bugurl=https://labs.parabola.nu/ \
+#      --disable-shared --enable-threads=posix \
+#      --with-system-zlib --enable-__cxa_atexit \
+#      --disable-libunwind-exceptions --enable-clocale=gnu \
+#      --disable-libstdcxx-pch \
+#      --enable-gnu-unique-object --enable-linker-build-id \
+#      --enable-cloog-backend=isl --disable-cloog-version-check \
+#      --enable-lto --enable-gold --enable-ld=default \
+#      --enable-plugin --with-plugin-ld=ld.gold \
+#      --with-linker-hash-style=gnu --disable-install-libiberty \
+#      --with-as=/usr/bin/${_target}-as --with-ld=/usr/bin/${_target}-ld \
+#      --disable-multilib --disable-libssp --disable-werror \
+#      --enable-checking=release \
+#      --target=${_target} \
+#      --with-newlib
   make
   
   # make documentation
@@ -96,7 +101,7 @@ check() {
 package()
 {
   pkgdesc="The GNU Compiler Collection"
-  depends=("gcc-libs=$pkgver-$pkgrel" "${_target}-binutils>=2.23" 'libmpc' 'cloog')
+  depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.23' 'libmpc' 'cloog')
   groups=("${_target}-devel")
   install=${_target}-gcc.install
 
diff --git a/libre/xtensa-unknown-elf-glibc/PKGBUILD b/libre/xtensa-unknown-elf-glibc/PKGBUILD
new file mode 100644
index 000000000..0a459b10b
--- /dev/null
+++ b/libre/xtensa-unknown-elf-glibc/PKGBUILD
@@ -0,0 +1,155 @@
+# $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
new file mode 100644
index 000000000..aa916ac2c
--- /dev/null
+++ b/libre/xtensa-unknown-elf-glibc/glibc-2.17-getaddrinfo-stack-overflow.patch
@@ -0,0 +1,47 @@
+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
new file mode 100644
index 000000000..b108f9d42
--- /dev/null
+++ b/libre/xtensa-unknown-elf-glibc/glibc-2.17-regexp-matcher-overrun.patch
@@ -0,0 +1,137 @@
+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
new file mode 100644
index 000000000..24b25c997
--- /dev/null
+++ b/libre/xtensa-unknown-elf-glibc/glibc-2.17-sync-with-linux37.patch
@@ -0,0 +1,130 @@
+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
new file mode 100644
index 000000000..5aff344c4
--- /dev/null
+++ b/libre/xtensa-unknown-elf-glibc/locale-gen
@@ -0,0 +1,42 @@
+#!/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
new file mode 100644
index 000000000..ccdd81734
--- /dev/null
+++ b/libre/xtensa-unknown-elf-glibc/locale.gen.txt
@@ -0,0 +1,23 @@
+# 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
new file mode 100644
index 000000000..bc80a0730
--- /dev/null
+++ b/libre/xtensa-unknown-elf-glibc/nscd.service
@@ -0,0 +1,17 @@
+[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
new file mode 100644
index 000000000..8a24a785e
--- /dev/null
+++ b/libre/xtensa-unknown-elf-glibc/nscd.tmpfiles
@@ -0,0 +1 @@
+d /run/nscd 0755 root root
diff --git a/libre/xtensa-unknown-elf-glibc/xtensa-unknown-elf-glibc.install b/libre/xtensa-unknown-elf-glibc/xtensa-unknown-elf-glibc.install
new file mode 100644
index 000000000..f8147a6cf
--- /dev/null
+++ b/libre/xtensa-unknown-elf-glibc/xtensa-unknown-elf-glibc.install
@@ -0,0 +1,19 @@
+infodir=usr/share/info
+filelist=(libc.info{,-1,-2,-3,-4,-5,-6,-7,-8,-9,-10,-11})
+
+post_upgrade() {
+  ldconfig -r .
+  locale-gen
+  
+  [[ -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
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
diff --git a/libre/xtensa-unknown-elf-linux-libre-api-headers/PKGBUILD b/libre/xtensa-unknown-elf-linux-libre-api-headers/PKGBUILD
index e27c1ba35..23dada50b 100644
--- a/libre/xtensa-unknown-elf-linux-libre-api-headers/PKGBUILD
+++ b/libre/xtensa-unknown-elf-linux-libre-api-headers/PKGBUILD
@@ -5,15 +5,15 @@
 # toolchain build order: linux-libre-api-headers->glibc->binutils->gcc->binutils->glibc
 export ARCH=xtensa
 _target=xtensa-unknown-elf
-_sysroot="/usr/${_target}"
+_sysroot="usr/$CHOST/${_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"
-arch=('i686' 'x86_64')
+pkgdesc="Kernel headers sanitized for use in userspace for Xtensa processors"
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/libc"
 license=('GPL2')
 provides=("${_target}-linux-api-headers=${pkgver}")
@@ -37,11 +37,11 @@ build() {
 
 package() {
   cd ${srcdir}/linux-${_basekernel}
-  make ARCH=${ARCH} INSTALL_HDR_PATH=${pkgdir}${_sysroot}/usr headers_install
+  make ARCH=${ARCH} INSTALL_HDR_PATH=${pkgdir}/${_sysroot} headers_install
 
   # use headers from libdrm
-  rm -r ${pkgdir}${_sysroot}/usr/include/drm
-  
+  rm -r ${pkgdir}/${_sysroot}/include/drm
+
   # clean-up unnecessary files generated during install
   find ${pkgdir} \( -name .install -o -name ..install.cmd \) -delete
 }
diff --git a/pcr/hiredis/ChangeLog b/pcr/hiredis/ChangeLog
new file mode 100644
index 000000000..fbe55643a
--- /dev/null
+++ b/pcr/hiredis/ChangeLog
@@ -0,0 +1,4 @@
+2013-06-07 Vladimir Tsanev <tsachev@gamil.com>
+    
+    * 0.11.0-1 :
+    Initial PKGBUILD.
diff --git a/pcr/hiredis/PKGBUILD b/pcr/hiredis/PKGBUILD
new file mode 100644
index 000000000..29762e87e
--- /dev/null
+++ b/pcr/hiredis/PKGBUILD
@@ -0,0 +1,33 @@
+# Maintainer: Vladimir Tsanev <tsachev@gmail.com>
+
+pkgname=hiredis
+pkgver=0.11.0
+pkgrel=1
+pkgdesc='minimalistic C client library for Redis'
+arch=('x86_64' 'i686')
+url="https://github.com/redis/hiredis/"
+license=('BSD')
+depends=('glibc')
+changelog='ChangeLog'
+source=(https://codeload.github.com/redis/${pkgname}/tar.gz/v${pkgver})
+md5sums=('e2ac29509823ccc96990b6fe765b5d46')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make 
+}
+
+#
+#check() {
+#  cd "${srcdir}/${pkgname}-${pkgver}"
+#  make test check c
+#}
+
+package() {
+  
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make PREFIX="$pkgdir/usr" clean dep install
+
+  install -Dm 644 COPYING "$pkgdir/usr/share/licenses/${pkgname}/COPYING"
+
+}
diff --git a/pcr/kamailio/PKGBUILD b/pcr/kamailio/PKGBUILD
new file mode 100644
index 000000000..3e040a495
--- /dev/null
+++ b/pcr/kamailio/PKGBUILD
@@ -0,0 +1,36 @@
+# Maintainer: Xavier Devlamynck <magicrhesus@ouranos.be>
+
+pkgname=kamailio
+pkgver=4.0.1
+pkgrel=1
+pkgdesc="Rock solid SIP server"
+url="http://www.kamailio.org/"
+license=('GPL2')
+arch=('i686' 'x86_64')
+makedepends=('flex' 'bison' 'docbook2x' 'mariadb' 'postgresql' 'libxml2'
+             'radiusclient-ng' 'lua51' 'mono' 'hiredis' 'libpurple' 'net-snmp'
+             'libunistring' 'python2')
+optdepends=('mariadb: mysql support'
+            'expat: xmpp/jabber support'
+            'libxml2: cpl and presence modules support'
+            'radiusclient-ng: radius support'
+            'postgresql: postgresql backend')
+source=(http://www.kamailio.org/pub/kamailio/$pkgver/src/kamailio-${pkgver}_src.tar.gz)
+sha256sums=('dd8652f47a572c0b0e1e45bdd0f6f838a14e50f2dbbeed77726ec0c7076e1769')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make cfg prefix=/usr cfg_prefix=/ bin_dir=/usr/bin
+  make PYTHON="python2" all
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make prefix=${pkgdir}/usr \
+       PYTHON="python2" \
+       cfg_prefix=${pkgdir} \
+       bind_dir=${pkgdir}/usr/bin \
+       bingroup_include="standard standard-dep stable experimental" \
+       skip_modules="iptrtpproxy osp dbtext oracle" \
+       install
+}
diff --git a/pcr/par/PKGBUILD b/pcr/par/PKGBUILD
new file mode 100644
index 000000000..2a6c0fac3
--- /dev/null
+++ b/pcr/par/PKGBUILD
@@ -0,0 +1,38 @@
+# Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com>
+# Contributor: quantax -- contact via Arch Linux forum or AUR
+
+pkgname=par
+pkgver=1.52
+pkgrel=3
+pkgdesc="Paragraph reformatter"
+url="http://www.nicemice.net/par/"
+depends=('glibc')
+arch=(i686 x86_64)
+license=('Custom')
+source=(http://www.nicemice.net/par/Par152-autoconf.tar.gz 
+        http://www.nicemice.net/par/par_1.52-i18n.3.diff.gz
+        http://www.nicemice.net/par/Par152.tar.gz )
+md5sums=('83e4d23a943ab07c44dd995b73195c70' 
+         'e79b448cb14323a39d817afce4847cdf'
+         '4ccacd824171ba2c2f14fb8aba78b9bf')
+
+prepare() {
+  cd $srcdir/Par152
+
+  patch -p1 -i $srcdir/par_1.52-i18n.3.diff
+}
+
+build() {
+  cd $srcdir/Par152
+  
+  ./configure --prefix=/usr
+  
+  make
+}
+  
+package() {
+  cd $srcdir/Par152
+  install --mode=755 -D par "${pkgdir}/usr/bin/par"
+  install --mode=644 -D par.1 "${pkgdir}/usr/share/man/man1/par.1"
+  install --mode=644 -D par.doc "${pkgdir}/usr/share/licenses/${pkgname}/par.doc"
+}
diff --git a/pcr/pybonjour/PKGBUILD b/pcr/pybonjour/PKGBUILD
index 9f77354b2..cb7d6bd45 100644
--- a/pcr/pybonjour/PKGBUILD
+++ b/pcr/pybonjour/PKGBUILD
@@ -16,4 +16,4 @@ md5sums=('30cbfd3e9e9721b39f6aa67df1c315a2')
 package() {
   cd $srcdir/$pkgname-$pkgver
   python2 setup.py install --root=$pkgdir
-  }
+}
diff --git a/pcr/radiusclient-ng/PKGBUILD b/pcr/radiusclient-ng/PKGBUILD
new file mode 100644
index 000000000..437030401
--- /dev/null
+++ b/pcr/radiusclient-ng/PKGBUILD
@@ -0,0 +1,31 @@
+# Contributor: Jonathan Liu <net147@gmail.com>
+pkgname=radiusclient-ng
+pkgver=0.5.6
+pkgrel=1
+pkgdesc="Client library and basic utilities for RADIUS AAA"
+arch=(i686 x86_64)
+url="http://wiki.freeradius.org/Radiusclient"
+license=('custom:NetBSD')
+depends=('bash')
+conflicts=('freeradius-client')
+source=(http://download.berlios.de/radiusclient-ng/$pkgname-$pkgver.tar.gz)
+md5sums=('6fb7d4d0aefafaee7385831ac46a8e9c')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure --prefix=/usr --sysconfdir=/etc
+  make
+
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir/" install
+
+  install -D -m644 "$srcdir/$pkgname-$pkgver/COPYRIGHT" \
+                   "$pkgdir/usr/share/licenses/${pkgver}/COPYRIGHT"
+
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/ruby-haml/ruby-yard/PKGBUILD b/pcr/ruby-haml/ruby-yard/PKGBUILD
deleted file mode 100644
index a686f937d..000000000
--- a/pcr/ruby-haml/ruby-yard/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Maintainer: Matt Harrison <matt at mistbyte dot com>
-# Contributor: Renzo Carbonara <gnuk0001@gmail.com>
-
-pkgname=ruby-yard
-_gemname=${pkgname#ruby-}
-pkgver=0.8.2.1
-pkgrel=2
-pkgdesc="Documentation tool for consistent and usable documentation in Ruby."
-arch=('any')
-url="http://yardoc.org"
-license=('MIT')
-groups=()
-depends=()
-makedepends=('rubygems')
-optdepends=()
-provides=()
-conflicts=()
-replaces=()
-backup=()
-options=()
-install=
-source=("http://gems.rubyforge.org/gems/yard-${pkgver}.gem")
-noextract=("yard-${pkgver}.gem")
-
-build() {
-  cd $srcdir
-  local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')"
-  gem install --no-user-install --ignore-dependencies -i "$pkgdir$_gemdir" \
-              -n "$pkgdir/usr/bin" ${_gemname}-$pkgver.gem
-  install -D "$pkgdir$_gemdir/gems/${_gemname}-$pkgver/LICENSE" \
-             "$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-md5sums=('08a48d23f8729b68945011cae7d121fe')
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/transmission-remote-cli/PKGBUILD b/pcr/transmission-remote-cli/PKGBUILD
index 5e3699bce..dcabaa642 100644
--- a/pcr/transmission-remote-cli/PKGBUILD
+++ b/pcr/transmission-remote-cli/PKGBUILD
@@ -1,29 +1,25 @@
 # Maintainer: fauno <fauno@kiwwwi.com.ar>
 pkgname=transmission-remote-cli
-pkgver=0.10.4
+pkgver=1.5.0
 pkgrel=1
 pkgdesc="Curses interface for the daemon of the BitTorrent client Transmission"
 arch=('any')
 url="https://github.com/fagga/transmission-remote-cli"
 license=('GPL3')
 depends=('python2')
-optdepends=('transmission-daemon>=2.40: for local transmission management'
+optdepends=('transmission-daemon: for local transmission management'
             'adns-python: Resolve IPs to host names'
-            'python-geoip: Guess which country peers come from')
+            'python2-geoip: Guess which country peers come from')
 conflicts=('transmission-remote-cli-git' "transmission-remote-cli<=20111013")
 replaces=('transmission-remote-cli-git')
-source=(http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-${pkgrel}-any.src.tar.xz
-        python2.patch)
+source=(https://github.com/fagga/${pkgname}/archive/v${pkgver}.tar.gz)
 
-build() {
+package() {
     cd "${srcdir}/${pkgname}"
     msg "Starting make..."
 
-    patch -Np1 -i ${srcdir}/python2.patch
-
 	install -d ${pkgdir}/usr/bin/
 	install -Dm755 transmission-remote-cli.py ${pkgdir}/usr/bin/transmission-remote-cli
 
 }
-md5sums=('b85382bc2e24c5733f9c3833098da668'
-         '6273609fb3a7294328aeaa526b76411c')
+md5sums=('4c13aa8596d35ce5793ea65affa8a6e5')
diff --git a/social/asterisk/PKGBUILD b/social/asterisk/PKGBUILD
index 896d5bacf..fe8204d0a 100644
--- a/social/asterisk/PKGBUILD
+++ b/social/asterisk/PKGBUILD
@@ -1,7 +1,7 @@
 # Contributor: Alessio Biancalana <dottorblaster@gmail.com>
 
 pkgname=asterisk
-pkgver=10.9.0
+pkgver=11.0.1
 pkgrel=1
 pkgdesc="A complete PBX solution"
 arch=('i686' 'x86_64')
@@ -15,20 +15,20 @@ source=(http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-$
 	asterisk \
 	asterisk.logrotated)
 install=$pkgname.install
-md5sums=('2fb85dc753584ac13692c27f9749c6cb'
+md5sums=('3e80a5cef7b0f8808578efcc84c39fd7'
          '59146273738605f1e011d8e7bed3561a'
          '486e07a0a1405ea25ec5b1736034653e')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-  make
+  make || return 1
 }
 
 package(){
   cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  make DESTDIR=${pkgdir} samples
+  make DESTDIR=${pkgdir} install || return 1
+  make DESTDIR=${pkgdir} samples || return 1
 
   (cd ${pkgdir}/etc/asterisk
 #  for i in `ls`; do [ $i = "asterisk.conf" ] || mv $i $i.default; done
diff --git a/~lukeshu/not-working/codeanalyst/PKGBUILD b/~lukeshu/not-working/codeanalyst/PKGBUILD
deleted file mode 100644
index 885e06f0e..000000000
--- a/~lukeshu/not-working/codeanalyst/PKGBUILD
+++ /dev/null
@@ -1,91 +0,0 @@
-# Maintainer (Parabola): Luke Shumaker <lukeshu@sbcglobal.net>
-# Maintainer (AUR): Felipe Bugno <capent@yahoo.com>
-
-# A note about the oprofile fork:
-# The docs claim that the fork is just for adding support for
-# processors that aren't upstream yet (at the time, they are now that
-# 0.9.7 is out). So, shouldn't we just link against 0.9.7? Well:
-#  * AMD also added a bunch of CodeAnalyst-specific code.
-#  * Several external variables/types have different names; the API is
-#    incompatible.
-#  * [extra]/oprofile-0.9.7-3 only includes about half of the headers.
-
-pkgbase=CodeAnalyst
-pkgname=(codeanalyst codeanalyst-cakm)
-pkgver=3.3.18.0361
-_pkgver="${pkgver//./_}"
-pkgrel=4.1
-pkgdesc="AMD performance profiler. Includes a fork of oprofile."
-url="http://developer.amd.com/tools/${pkgbase}/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gcc' 'qt>=4.1' 'libdwarf')
-makedepends=('linux-headers' 'elfutils' 'findutils' 'file')
-options=('!strip')
-install=codeanalyst.install
-source=("http://download2-developer.amd.com/amd/${pkgbase}/${pkgbase}${_pkgver}Public.tar.gz"
-	'gcc47.patch'
-	'skipSetup.patch'
-        'kernel3.4.patch'
-        'codeanalyst.sudo'
-        'codeanalyst.desktop'
-	'codeanalyst.svg')
-
-build() {
-  build_codeanalyst
-  build_codeanalyst-cakm
-}
-
-build_codeanalyst() {
-  cd "${srcdir}/${pkgbase}-${_pkgver}-Public"
-  patch -Np1 -i "${srcdir}/gcc47.patch"
-  patch -Np1 -i "${srcdir}/skipSetup.patch"
-  rm -rf src/dwarf-* # easiest way to ensure using the system install
-
-  ./autogen.sh
-  ./configure --prefix=/usr \
-    --with-libdwarf-includes=/usr/include/libdwarf \
-    --with-libdwarf-libraries=/usr/lib
-  make
-}
-
-build_codeanalyst-cakm() {
-  cd "${srcdir}/${pkgbase}-${_pkgver}-Public"/src/cakm
-  cp -r kernel2.6.38 kernel3.4
-  cd kernel3.4
-  patch -Np1 -i "${srcdir}/kernel3.4.patch"
-  make
-}
-
-package_codeanalyst() {
-  provides=('oprofile=0.9.6cvs')
-  conflicts=('oprofile')
-
-  cd "${srcdir}/${pkgbase}-${_pkgver}-Public"
-  make DESTDIR="${pkgdir}" install
-  rm -f "${pkgdir}/usr/sbin/ca_user_manager" # either codeanalyst.install does this, or it is trivial
-
-  find "${pkgdir}"/usr/{bin,sbin} -type f -exec file '{}' +|sed -n 's/:\s*ELF .*//p'|xargs strip
-
-  cd "${srcdir}"
-  install -D -m644 codeanalyst.sudo "${pkgdir}/etc/sudoers.d/codeanalyst"
-  install -D -m644 codeanalyst.svg "${pkgdir}/usr/share/icons/hicolor/scalable/apps/codeanalyst.svg"
-  install -D -m644 codeanalyst.desktop "${pkgdir}/usr/share/applications/codeanalyst.desktop"
-}
-
-package_codeanalyst-cakm() {
-  pkgdesc="CodeAnalyst kernel module, oprofile-ca.ko, a replacement for oprofile.ko"
-  depends=(codeanalyst)
-  provides=()
-
-  cd "${srcdir}/${pkgbase}-${_pkgver}-Public"/src/cakm/kernel3.4
-  install -D -m644 oprofile.ko "${pkgdir}/lib/modules/`uname -r`/kernel/arch/x86/oprofile/oprofile-ca.ko"
-}
-
-md5sums=('f1e29bc7c7da259df228ce59281ee1d7'
-         '063d0fc9680641a92ce5e310ffe1c9c0'
-         'ce549e59c4a5916fd19e8d085e863627'
-         '3a5d820a43a0360d561bb0c4d67d9735'
-         '3cc8f64fe84c5a886d0172ee8d99f690'
-         '3a18d3f7fb01f199a8ed5ae2908c18e4'
-         '1822a4157b82904b82e72fc1e9bcbd42')
diff --git a/~lukeshu/not-working/codeanalyst/codeanalyst.desktop b/~lukeshu/not-working/codeanalyst/codeanalyst.desktop
deleted file mode 100644
index 56d54f884..000000000
--- a/~lukeshu/not-working/codeanalyst/codeanalyst.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=AMD CodeAnalyst
-Comment=AMD profiler and performance analyzer
-Exec=/usr/bin/CodeAnalyst
-Icon=codeanalyst
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Development;
diff --git a/~lukeshu/not-working/codeanalyst/codeanalyst.install b/~lukeshu/not-working/codeanalyst/codeanalyst.install
deleted file mode 100644
index 6ed1ac841..000000000
--- a/~lukeshu/not-working/codeanalyst/codeanalyst.install
+++ /dev/null
@@ -1,29 +0,0 @@
-post_install() {
-  getent group amdca &>/dev/null ||  groupadd amdca &>/dev/null
-  echo " ==> To use CodeAnalyst as non-root, you must be in the 'amdca' group"
-  echo "     ie: gpasswd -a USERNAME amdca"
-
-  chown root:amdca /usr/bin/calog_report
-  chown root:amdca /usr/bin/capackage.sh
-  chown root:amdca /usr/bin/careport.sh
-  chown root:amdca /usr/bin/cgreport
-  chown root:amdca /usr/bin/CodeAnalyst
-  chown root:amdca /usr/bin/opannotate
-  chown root:amdca /usr/bin/oparchive
-  chown root:amdca /usr/bin/opcontrol
-  chown root:amdca /usr/bin/opgprof
-  chown root:amdca /usr/bin/ophelp
-  chown root:amdca /usr/bin/opimport
-  chown root:amdca /usr/bin/opjitconv
-  chown root:amdca /usr/bin/opreport
-  chown root:amdca /usr/bin/oprofiled
-  chown root:amdca /usr/sbin/ca_oprofile_controller
-  #chown root:amdca /usr/sbin/ca_user_manager
-
-  update-desktop-database -q
-}
-
-post_remove() {
-  getent group amdca &>/dev/null && groupdel amdca &>/dev/null
-  update-desktop-database -q
-}
diff --git a/~lukeshu/not-working/codeanalyst/codeanalyst.sudo b/~lukeshu/not-working/codeanalyst/codeanalyst.sudo
deleted file mode 100644
index 1c3173bdb..000000000
--- a/~lukeshu/not-working/codeanalyst/codeanalyst.sudo
+++ /dev/null
@@ -1 +0,0 @@
-%amdca ALL= NOPASSWD: /usr/sbin/ca_oprofile_controller
diff --git a/~lukeshu/not-working/codeanalyst/codeanalyst.svg b/~lukeshu/not-working/codeanalyst/codeanalyst.svg
deleted file mode 100644
index 8febf725b..000000000
--- a/~lukeshu/not-working/codeanalyst/codeanalyst.svg
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 12.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Layer_1"
-   width="286.95001"
-   height="286.95001"
-   viewBox="0 0 286.95063 286.95"
-   overflow="visible"
-   enable-background="new 0 0 1368.987 286.954"
-   xml:space="preserve"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="AMD_Logo.svg"
-   style="overflow:visible"><metadata
-   id="metadata17"><rdf:RDF><cc:Work
-       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-   id="defs15" /><sodipodi:namedview
-   pagecolor="#ffffff"
-   bordercolor="#666666"
-   borderopacity="1"
-   objecttolerance="10"
-   gridtolerance="10"
-   guidetolerance="10"
-   inkscape:pageopacity="0"
-   inkscape:pageshadow="2"
-   inkscape:window-width="1920"
-   inkscape:window-height="1028"
-   id="namedview13"
-   showgrid="false"
-   inkscape:zoom="2.11"
-   inkscape:cx="163.32315"
-   inkscape:cy="145.21584"
-   inkscape:window-x="-4"
-   inkscape:window-y="-3"
-   inkscape:window-maximized="1"
-   inkscape:current-layer="Layer_1" />
-<polyline
-   points="1165.47,92.779 1165.39,203.495 1281.63,203.513 1198.44,286.826 1081.79,286.954 1080.38,176.065 1165.47,92.779"
-   id="polyline3"
-   style="fill:#009a66"
-   transform="translate(-1082.0371,1.8496035e-4)" />
-<polyline
-   points="1165.39,84.082 1285.07,83.854 1284.83,202.972 1368.99,286.954 1368.75,0.12 1081.79,0 1165.39,84.082"
-   id="polyline5"
-   style="fill:#009a66"
-   transform="translate(-1082.0371,1.8496035e-4)" />
-
-
-
-</svg>
\ No newline at end of file
diff --git a/~lukeshu/not-working/codeanalyst/gcc47.patch b/~lukeshu/not-working/codeanalyst/gcc47.patch
deleted file mode 100644
index dfec4a0c4..000000000
--- a/~lukeshu/not-working/codeanalyst/gcc47.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca/cg/Makefile.am CodeAnalyst-3_3_18_0361-Public/src/ca/cg/Makefile.am
-*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca/cg/Makefile.am	2012-04-13 02:41:43.000000000 -0300
---- CodeAnalyst-3_3_18_0361-Public/src/ca/cg/Makefile.am	2012-04-22 17:55:01.227439003 -0300
-***************
-*** 25,31 ****
-  	cgcvt.cpp
-  
-  
-! cgreport_LDFLAGS = -Wl -fPIC @QT_LDFLAGS@
-  
-  AM_CPPFLAGS= $(INCLUDES) $(more_flags) \
-  			 $(FLAG64) -Wno-unused -Wno-parentheses \
---- 25,31 ----
-  	cgcvt.cpp
-  
-  
-! cgreport_LDFLAGS = -fPIC @QT_LDFLAGS@
-  
-  AM_CPPFLAGS= $(INCLUDES) $(more_flags) \
-  			 $(FLAG64) -Wno-unused -Wno-parentheses \
-diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca/gui/MonitorDockView.cpp CodeAnalyst-3_3_18_0361-Public/src/ca/gui/MonitorDockView.cpp
-*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca/gui/MonitorDockView.cpp	2012-04-13 02:41:43.000000000 -0300
---- CodeAnalyst-3_3_18_0361-Public/src/ca/gui/MonitorDockView.cpp	2012-04-22 17:38:14.884058192 -0300
-***************
-*** 17,22 ****
---- 17,23 ----
-  */
-  
-  #include <qtooltip.h>
-+ #include <unistd.h>
-  
-  #include "MonitorDockView.h"
-  
-diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca/libs/libca/dwarfengine.cpp CodeAnalyst-3_3_18_0361-Public/src/ca/libs/libca/dwarfengine.cpp
-*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca/libs/libca/dwarfengine.cpp	2012-04-13 02:41:43.000000000 -0300
---- CodeAnalyst-3_3_18_0361-Public/src/ca/libs/libca/dwarfengine.cpp	2012-04-22 17:34:45.670714989 -0300
-***************
-*** 21,26 ****
---- 21,27 ----
-  #include <sys/types.h>
-  #include <sys/stat.h>
-  #include <fcntl.h>
-+ #include <unistd.h>
-  
-  #include "dwarfengine.h"
-  #define DWARF_DEBUG		0
-diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca/libs/libopdata/opdata_handler.cpp CodeAnalyst-3_3_18_0361-Public/src/ca/libs/libopdata/opdata_handler.cpp
-*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca/libs/libopdata/opdata_handler.cpp	2012-04-13 02:41:43.000000000 -0300
---- CodeAnalyst-3_3_18_0361-Public/src/ca/libs/libopdata/opdata_handler.cpp	2012-04-22 17:32:30.780708624 -0300
-***************
-*** 29,34 ****
---- 29,35 ----
-  #include <sys/stat.h>
-  #include <fcntl.h>
-  #include <time.h>
-+ #include <unistd.h>
-  
-  // CodeAnalyst headers
-  #include "CaProfileWriter.h"
-diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca_agent/libCAagent/slock.cpp CodeAnalyst-3_3_18_0361-Public/src/ca_agent/libCAagent/slock.cpp
-*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca_agent/libCAagent/slock.cpp	2012-04-13 02:41:43.000000000 -0300
---- CodeAnalyst-3_3_18_0361-Public/src/ca_agent/libCAagent/slock.cpp	2012-04-22 17:26:58.424026278 -0300
-***************
-*** 13,18 ****
---- 13,19 ----
-  #include <sys/ipc.h>
-  #include <sys/sem.h>
-  #include <sys/stat.h>
-+ #include <unistd.h>
-  
-  #include "slock.h"
-  #include "smm.h"
diff --git a/~lukeshu/not-working/codeanalyst/kernel3.4.patch b/~lukeshu/not-working/codeanalyst/kernel3.4.patch
deleted file mode 100644
index 589abc800..000000000
--- a/~lukeshu/not-working/codeanalyst/kernel3.4.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -ru kernel2.6.38/Makefile kernel3.4/Makefile
---- kernel2.6.38/Makefile	2012-04-13 01:41:43.000000000 -0400
-+++ kernel3.4/Makefile	2012-07-11 11:32:27.000000000 -0400
-@@ -1,6 +1,6 @@
- TARGET = oprofile.ko
- 
--MDIR = $(if $(shell uname -m | grep x86_64),arch/x86/oprofile,arch/x86/oprofile)
-+MDIR = arch/x86/oprofile
- 
- DRIVER_OBJS =   oprof.o cpu_buffer.o buffer_sync.o \
- 		event_buffer.o oprofile_files.o \
-@@ -16,7 +16,8 @@
- CURRENT = $(shell uname -r)
- ARCH = $(if $(shell uname -m | grep x86_64),64,32)
- KERN_ARCH = $(if $(shell uname -m | grep x86_64),x86_64,i386)
--KDIR = /lib/modules/$(CURRENT)/build
-+SYS_KDIR = /lib/modules/$(CURRENT)/build
-+KDIR = $(PWD)/../build
- PWD = $(shell pwd)
- DEST = /lib/modules/$(CURRENT)/kernel/$(MDIR)
- USE_INTERNAL_ERRATA = $(if $(shell ls ../internal/errata.h 2> /dev/null),1,0)
-@@ -39,6 +40,8 @@
- all: default
- 
- default:
-+	rm -rf $(KDIR)
-+	cp -r $(SYS_KDIR)/ $(KDIR)
- 	make -C $(KDIR) SUBDIRS=$(PWD) CFLAGS_MODULE+="-DMODULE -DUSE_INTERNAL_ERRATA=$(USE_INTERNAL_ERRATA)" modules ARCH=$(KERN_ARCH)
- 
- install:
-@@ -52,13 +55,12 @@
- 
- uninstall:
- 	@echo  "... Restore original oprofile.ko."
--	@mv -v $(DEST)/$(TARGET).orig $(DEST)/$(TARGET) 
-+	@mv -v $(DEST)/$(TARGET).orig $(DEST)/$(TARGET)
- 
- clean:
- 	rm -f *.o oprofile.ko .*.cmd .*.flags *.mod.c
- 
- prebuild: 
- 	cp $(TARGET) ../prebuilds/$(CURRENT)_$(ARCH).ko
--	
- 
---include $(KDIR)/Rules.make
-+-include $(SYS_KDIR)/Rules.make
-Only in kernel3.4/: modules.order
-Only in kernel3.4/: Module.symvers
-diff -ru kernel2.6.38/nmi_int.c kernel3.4/nmi_int.c
---- kernel2.6.38/nmi_int.c	2012-04-13 01:41:43.000000000 -0400
-+++ kernel3.4/nmi_int.c	2012-07-11 11:32:27.000000000 -0400
-@@ -16,7 +16,6 @@
- #include <linux/notifier.h>
- #include <linux/smp.h>
- #include "oprofile.h"
--#include <linux/sysdev.h>
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0) 
- #include <linux/syscore_ops.h>
- #endif
-diff -ru kernel2.6.38/oprofilefs.c kernel3.4/oprofilefs.c
---- kernel2.6.38/oprofilefs.c	2012-04-13 01:41:43.000000000 -0400
-+++ kernel3.4/oprofilefs.c	2012-07-11 11:32:27.000000000 -0400
-@@ -244,7 +244,7 @@
- 		return -ENOMEM;
- 	root_inode->i_op = &simple_dir_inode_operations;
- 	root_inode->i_fop = &simple_dir_operations;
--	root_dentry = d_alloc_root(root_inode);
-+	root_dentry = d_make_root(root_inode);
- 	if (!root_dentry) {
- 		iput(root_inode);
- 		return -ENOMEM;
-Only in kernel3.4/: .tmp_versions
diff --git a/~lukeshu/not-working/codeanalyst/skipSetup.patch b/~lukeshu/not-working/codeanalyst/skipSetup.patch
deleted file mode 100644
index fdc9bf42f..000000000
--- a/~lukeshu/not-working/codeanalyst/skipSetup.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca/Makefile.am CodeAnalyst-3_3_18_0361-Public/src/ca/Makefile.am
-*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca/Makefile.am	2012-04-13 02:41:43.000000000 -0300
---- CodeAnalyst-3_3_18_0361-Public/src/ca/Makefile.am	2012-04-22 20:44:07.437917684 -0300
-***************
-*** 8,19 ****
-  # FIXME	[3.0] diffgui \
-  #    $(CA_RELEASE_TYPE)
-  
-! install-exec-hook:
-! 	@if test -e "scripts/Setup.sh"; then \
-! 		scripts/Setup.sh $(DESTDIR)$(prefix); \
-! 	fi
-  
-! uninstall-hook:
-! 	@if test -e "scripts/Uninstall.sh"; then \
-! 		scripts/Uninstall.sh $(DESTDIR)$(prefix);\
-! 	fi
---- 8,19 ----
-  # FIXME	[3.0] diffgui \
-  #    $(CA_RELEASE_TYPE)
-  
-! #install-exec-hook:
-! #	@if test -e "scripts/Setup.sh"; then \
-! #		scripts/Setup.sh $(DESTDIR)$(prefix); \
-! #	fi
-  
-! #uninstall-hook:
-! #	@if test -e "scripts/Uninstall.sh"; then \
-! #		scripts/Uninstall.sh $(DESTDIR)$(prefix);\
-! #	fi
-diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca_agent/jvmpi/Makefile.am CodeAnalyst-3_3_18_0361-Public/src/ca_agent/jvmpi/Makefile.am
-*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca_agent/jvmpi/Makefile.am	2012-04-13 02:41:43.000000000 -0300
---- CodeAnalyst-3_3_18_0361-Public/src/ca_agent/jvmpi/Makefile.am	2012-04-22 20:47:21.604593511 -0300
-***************
-*** 15,20 ****
-  libCAJVMPIA_so_SOURCES = \
-      jpa.cpp 
-      
-! install-exec-hook:
-! 	@/sbin/ldconfig
-  
---- 15,20 ----
-  libCAJVMPIA_so_SOURCES = \
-      jpa.cpp 
-      
-! #install-exec-hook:
-! #	@/sbin/ldconfig
-  
-diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/Makefile.am CodeAnalyst-3_3_18_0361-Public/src/Makefile.am
-*** CodeAnalyst-3_3_18_0361-Public.orig/src/Makefile.am	2012-04-13 02:41:43.000000000 -0300
---- CodeAnalyst-3_3_18_0361-Public/src/Makefile.am	2012-04-22 20:44:57.674586720 -0300
-***************
-*** 8,21 ****
-  install-exec-hook:
-  	@if test -e "${LIBDWARF_DIR}libdwarf.so"; then \
-  		install -pD -m 755 ${LIBDWARF_DIR}libdwarf.so $(DESTDIR)$(prefix)/lib/libdwarf.so ; \
-- 		/sbin/ldconfig ;\
-  	fi
-  
-  uninstall-hook:
-  	@if test -e "${LIBDWARF_DIR}libdwarf.so"; then \
-  		if test -e "$(DESTDIR)$(prefix)/lib/libdwarf.so"; then \
-  			rm -f $(DESTDIR)$(prefix)/lib/libdwarf.so ; \
-- 			/sbin/ldconfig ; \
-  		fi ; \
-  	fi
-  
---- 8,19 ----
diff --git a/~lukeshu/openni-all/openni-git/PKGBUILD b/~lukeshu/openni-all/openni-git/PKGBUILD
deleted file mode 100644
index 7ac6abb87..000000000
--- a/~lukeshu/openni-all/openni-git/PKGBUILD
+++ /dev/null
@@ -1,286 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Contributor: Sven Schneider <archlinux.sandmann@googlemail.com>
-# Contributor: bugix
-# Contributor: Lubosz Sarnecki <lubosz at gmail>
-
-# unfortunately we can't use $_suf in function names, but sed makes it ok
-_suf='-git'
-pkgname=(
-    openni$_suf
-    openni$_suf-docs
-
-    openni$_suf-core
-    openni$_suf-core-samples
-    openni$_suf-core-samples-source
-    
-    openni$_suf-mono
-    openni$_suf-mono-samples
-    openni$_suf-mono-samples-source
-
-    openni$_suf-java
-    openni$_suf-java-samples
-    openni$_suf-java-samples-source
-    )
-pkgver=20111121
-pkgrel=4
-arch=('i686' 'x86_64')
-url="http://www.openni.org/"
-license=('GPL')
-makedepends=('git' 'doxygen' 'graphviz')
-source=()
-md5sums=()
-
-_gitroot="git://github.com/OpenNI/OpenNI.git"
-_gitname="openni"
-#_gitbranch="unstable"
-_gitbranch="master"
-
-_os='Linux'
-case "${CARCH}" in
-'x86_64') _arch=x86;;
-'i686')   _arch=x86;;
-'arm')    _arch=Arm;; # untested
-*)        _arch=UNSUPPORTED_ARCH;;
-esac
-_platform="${_os}-${_arch}"
-
-export MAKEFLAGS+=' -j1 '
-
-build() {
-  cd "${srcdir}"
-  msg "Connecting to GIT server...."
-
-  if [ -d ${_gitname} ] ; then
-    cd ${_gitname}
-    git checkout master
-    git pull origin
-    msg "The local files are updated."
-  else
-    git clone ${_gitroot} ${_gitname}
-    cd ${_gitname}
-  fi
-  git checkout ${_gitbranch}
-  cd ..
-
-  msg "GIT checkout done or server timeout"
-  msg "Starting make..."
-
-  rm -rf "${srcdir}/${_gitname}-build"
-  git clone "${srcdir}/${_gitname}" "${srcdir}/${_gitname}-build"
-  cd "${srcdir}/${_gitname}-build"
-
-  # PATCH
-  sed -i 's/python /python2 /' "Platform/${_platform}/CreateRedist/RedistMaker"
-  echo '
-abs_core: $(ALL_MODULES) $(ALL_UTILS)
-abs_core_samples: $(CORE_SAMPLES)
-abs_java: $(ALL_JAVA_PROJS)
-abs_java_samples: $(JAVA_SAMPLES)
-abs_mono: $(ALL_MONO_PROJS)
-abs_mono_samples: $(MONO_SAMPLES) $(MONO_FORMS_SAMPLES)
-' >> "Platform/${_platform}/Build/Makefile"
-
-  
-  # BUILD
-  cd "Platform/${_platform}/Build"
-  make -j1 \
-      abs_core abs_core_samples \
-      abs_java abs_java_samples \
-      abs_mono abs_mono_samples || return 1
-
-  cd '../../../Source/DoxyGen'
-  mkdir html
-  doxygen Doxyfile
-  rm -rf html/*.map html*.md5 html/*.hhc html/*.hhp
-}
-
-package_openni-git() {
-  pkgdesc="Open Natural Interface framework"
-  depends=("openni$_suf-core")
-  optdepends=("openni$_suf-docs: programmer documentation")
-  provides=('openni')
-  conflicts=('openni')
-}
-
-package_openni-git-docs() {
-  pkgdesc="OpenNI programmer documentation"
-  arch=('any')
-  provides=('openni-docs')
-  conflicts=('openni-docs')
-
-  cd "${srcdir}/${_gitname}-build/Source/DoxyGen/"
-  install -d "${pkgdir}/usr/share/openni"
-  cp -r html "${pkgdir}/usr/share/openni"
-}
-
-package_openni-git-core() {
-  pkgdesc="OpenNI core libraries"
-  depends=('libusb' 'freeglut')
-  install="openni.install"
-  provides=('openni-core')
-  conflicts=('openni-core')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release"
-
-  LIB_FILES='
-    libnimCodecs.so
-    libnimMockNodes.so
-    libnimRecorder.so
-    libOpenNI.so
-    '
-  install -d "${pkgdir}/usr/lib"
-  install -m755 $LIB_FILES "${pkgdir}/usr/lib"
-
-  BIN_FILES='niReg niLicense'
-  install -d "${pkgdir}/usr/bin"
-  install -m755 $BIN_FILES "${pkgdir}/usr/bin"
-
-  cd "${srcdir}/${_gitname}-build/Include"
-  install -d "${pkgdir}/usr/include/ni"
-  install -m644 *.h "${pkgdir}/usr/include/ni"
-  cp -r "${_platform}" "${pkgdir}/usr/include/ni"
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Build"
-  install -d "${pkgdir}/usr/share"
-  cp -r Common "${pkgdir}/usr/share/common"
-}
-
-package_openni-git-java() {
-  pkgdesc="OpenNI java wrapper"
-  depends=("openni$_suf" 'java-environment')
-  provides=('openni-java')
-  conflicts=('openni-java')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release"
-
-  install -d "${pkgdir}/usr/lib"
-  install -m755 libOpenNI.jni.so "${pkgdir}/usr/lib"
-  
-  install -d "${pkgdir}/usr/share/openni/java"
-  install -m755 org.OpenNI.jar "${pkgdir}/usr/share/openni/java"
-}
-
-package_openni-git-mono() {
-  pkgdesc="OpenNI mono wrapper"
-  depends=("openni$_suf" 'mono')
-  provides=('openni-mono')
-  conflicts=('openni-mono')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release"
-  
-  install -d "${pkgdir}/usr/share/openni/mono"
-  install -m755 OpenNI.net.dll "${pkgdir}/usr/share/openni/mono"
-}
-
-# SAMPLES
-
-_install_sample_source() {
-  sample=$1
-  makefile="Platform/${_platform}/Build/Samples/$sample/Makefile"
-  install -d                "${pkgdir}/usr/share/openni/samples"
-  cp -r "Samples/$sample"   "${pkgdir}/usr/share/openni/samples/$sample"
-  install -m644 "$makefile" "${pkgdir}/usr/share/openni/samples/$sample"
-}
-
-# Leave out NiViewer, it's set up wrong
-CORE_SAMPLES='
-  AudioSample
-  BackRecorder
-  CRead
-  ConvertXToONI
-  RecordSynthetic
-  SimpleCreate
-              SimpleRead SimpleViewer UserTracker'
-MONO_SAMPLES='SimpleRead SimpleViewer UserTracker'
-JAVA_SAMPLES='SimpleRead SimpleViewer UserTracker'
-
-package_openni-git-core-samples() {
-  pkgdesc="OpenNI sample programs"
-  depends=("openni$_suf-core")
-  optdepends=('openni-core-samples-source: source code for the samples')
-  provides=('openni-core-samples')
-  conflicts=('openni-core-samples')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release"
-  install -d "${pkgdir}/usr/bin"
-  install -m755 NiViewer "${pkgdir}/usr/bin/niSample-Viewer"
-  for sample in $CORE_SAMPLES; do
-    install -m766 Sample-Ni$sample "${pkgdir}/usr/bin/niSample-$sample"
-  done
-}
-package_openni-git-core-samples-source() {
-  pkgdesc="OpenNI sample programs source code"
-  depends=("openni$_suf-core")
-  provides=('openni-core-samples-source')
-  conflicts=('openni-core-samples-source')
-  options+=('!strip')
-
-  cd "${srcdir}/${_gitname}-build"
-  for sample in Viewer $CORE_SAMPLES; do
-    _install_sample_source Ni$sample
-  done
-}
-
-package_openni-git-java-samples() {
-  pkgdesc="OpenNI java wrapper sample programs"
-  depends=("openni$_suf-java")
-  optdepends=("openni$_suf-java-samples-source: source code for the samples")
-  arch=('any')
-  provides=('openni-java-samples')
-  conflicts=('openni-java-samples')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release"
-  install -d "${pkgdir}/usr/bin"
-  install -d "${pkgdir}/usr/share/openni/java"
-  for sample in $JAVA_SAMPLES; do
-    install -m644 org.OpenNI.Samples.$sample.jar "${pkgdir}/usr/share/openni/java"
-    echo "#/bin/sh
-java -jar /usr/share/openni/java/org.OpenNI.Samples.$sample.jar $@
-" > "${pkgdir}/usr/bin/niSample-$sample.jar"
-    chmod 755 "${pkgdir}/usr/bin/niSample-$sample.jar"
-  done
-}
-package_openni-git-java-samples-source() {
-  pkgdesc="OpenNI java wrapper sample programs source code"
-  depends=("openni$_suf-java")
-  provides=('openni-java-samples-source')
-  conflicts=('openni-java-samples-source')
-  options+=('!strip')
-
-  cd "${srcdir}/${_gitname}-build"
-  for sample in $JAVA_SAMPLES; do
-    _install_sample_source $sample.java
-  done
-}
-
-package_openni-git-mono-samples() {
-  pkgdesc="OpenNI java wrapper sample programs"
-  depends=("openni$_suf-mono")
-  optdepends=("openni$_suf-mono-samples-source: source code for the samples")
-  provides=('openni-mono-samples')
-  conflicts=('openni-mono-samples')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release"
-  install -d "${pkgdir}/usr/bin"
-  install -d "${pkgdir}/usr/share/openni/mono"
-  for sample in $MONO_SAMPLES; do
-    install -m755 $sample.net.exe "${pkgdir}/usr/share/openni/mono"
-    echo "#/bin/sh
-cd /usr/share/openni/mono
-mono $sample.net.exe $@
-" > "${pkgdir}/usr/bin/niSample-$sample.net"
-    chmod 755 "${pkgdir}/usr/bin/niSample-$sample.net"
-  done
-}
-package_openni-git-mono-samples-source() {
-  pkgdesc="OpenNI mono wrapper sample programs source code"
-  depends=("openni$_suf-mono")
-  provides=('openni-mono-samples-source')
-  conflicts=('openni-mono-samples-source')
-  options+=('!strip')
-
-  cd "${srcdir}/${_gitname}-build"
-  for sample in $MONO_SAMPLES; do
-    _install_sample_source $sample.net
-  done
-}
diff --git a/~lukeshu/openni-all/openni-git/openni.install b/~lukeshu/openni-all/openni-git/openni.install
deleted file mode 100644
index 8470f4512..000000000
--- a/~lukeshu/openni-all/openni-git/openni.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	MODULES="libnimMockNodes.so libnimCodecs.so libnimRecorder.so"
-	for module in $MODULES
-	do 
-		/usr/bin/niReg /usr/lib/$module
-	done
-}
-
-pre_remove() {
-	rm /var/lib/ni/modules.xml
-}
diff --git a/~lukeshu/openni-all/openni-module-primesensor-git/PKGBUILD b/~lukeshu/openni-all/openni-module-primesensor-git/PKGBUILD
deleted file mode 100644
index 0ebfac2e5..000000000
--- a/~lukeshu/openni-all/openni-module-primesensor-git/PKGBUILD
+++ /dev/null
@@ -1,65 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Contributor: pallegro from the AUR
-
-_pkgname=openni-module-primesensor
-pkgname=${_pkgname}-git
-pkgver=20111115
-pkgrel=1
-pkgdesc="OpenNI PrimeSensor harware modules for the PrimeSense sensor device"
-arch=('i686')
-url="http://www.primesense.com/"
-license=('GPL')
-depends=('openni')
-makedepends=('git')
-provides=($_pkgname)
-conflicts=($_pkgname)
-install="sensorkinect.install"
-source=()
-md5sums=()
-
-_gitroot="https://github.com/PrimeSense/Sensor.git"
-_gitname="primesensor"
-_gitbranch="unstable"
-#_gitbranch="master"
-
-build() {
-  cd "$srcdir"
-  msg "Connecting to GIT server...."
-
-  if [ -d $_gitname ] ; then
-    cd $_gitname && git pull origin
-    msg "The local files are updated."
-  else
-    git clone -b $_gitbranch $_gitroot $_gitname
-  fi
-
-  msg "GIT checkout done or server timeout"
-  msg "Starting make..."
-
-  rm -rf "$srcdir/$_gitname-build"
-  git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build"
-  cd $srcdir/$_gitname-build
-
-  # BUILD
-  cd Platform/Linux-x86/Build
-  make NI_CONF_DIR=/etc || return 1
-}
-
-package() {
-  install -d -m755 ${pkgdir}/usr/{lib,bin}
-
-  cd $srcdir/$_gitname-build/Platform/Linux-x86/Bin/Release
-  install XnSensorServer ${pkgdir}/usr/bin
-  install libXnCore.so libXnDDK.so libXnDeviceFile.so libXnDeviceSensorV2KM.so libXnFormats.so ${pkgdir}/usr/lib
-  chmod +s ${pkgdir}/usr/bin/XnSensorServer
-
-  cd $srcdir/$_gitname-build/Platform/Linux-x86/Install
-  install -d -m755 ${pkgdir}/etc/udev/rules.d
-  install 55-primesense-usb.rules ${pkgdir}/etc/udev/rules.d
-
-  cd $srcdir/$_gitname-build/Data
-  install -d -m755 ${pkgdir}/etc/primesense
-  install GlobalDefaultsKinect.ini ${pkgdir}/etc/primesense
-
-  install -d -m777 ${pkgdir}/var/log/primesense/XnSensorServer 
-}
diff --git a/~lukeshu/openni-all/openni-module-sensorkinect-git/PKGBUILD b/~lukeshu/openni-all/openni-module-sensorkinect-git/PKGBUILD
deleted file mode 100644
index 2a2abbdc5..000000000
--- a/~lukeshu/openni-all/openni-module-sensorkinect-git/PKGBUILD
+++ /dev/null
@@ -1,77 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Contributor: pallegro from the AUR
-
-pkgname=openni-module-sensorkinect-git
-pkgver=20111211
-pkgrel=2
-pkgdesc="OpenNI SensorKinect harware modules for the Xbox Kinect device"
-arch=('i686' 'x86_64')
-url="https://github.com/avin2/SensorKinect"
-license=('GPL')
-depends=('openni-unstable' 'kinect-udev')
-makedepends=('git')
-provides=('openni-module-sensorkinect')
-conflicts=('openni-module-sensorkinect' 'openni-module-primesensor')
-install="sensorkinect.install"
-source=()
-md5sums=()
-
-_gitroot="https://github.com/avin2/SensorKinect.git"
-_gitname="sensorkinect"
-_gitbranch="master"
-
-_os='Linux'
-case "${CARCH}" in
-'x86_64') _arch=x86;;
-'i686')   _arch=x86;;
-'arm')    _arch=Arm;; # untested
-*)        _arch=UNSUPPORTED_ARCH;;
-esac
-_platform="${_os}-${_arch}"
-
-build() {
-  cd "$srcdir"
-  msg "Connecting to GIT server...."
-
-  if [ -d ${_gitname} ] ; then
-    cd ${_gitname}
-    git checkout master
-    git pull origin
-    msg "The local files are updated."
-  else
-    git clone ${_gitroot} ${_gitname}
-    cd ${_gitname}
-  fi
-  git checkout ${_gitbranch}
-  cd ..
-
-  msg "GIT checkout done or server timeout"
-  msg "Starting build..."
-
-  rm -rf "$srcdir/$_gitname-build"
-  git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build"
-  cd $srcdir/$_gitname-build
-
-  # BUILD
-  cd Platform/${_platform}/Build
-  make
-  make redist
-}
-
-package() {
-  cd $srcdir/$_gitname-build
-  cd Platform/${_platform}/Redist
-
-  # This is all cloned from ./install.sh, which can't be used for a number
-  # of reasons.
-  install -d $pkgdir/usr/{lib,bin}
-  install -m755 Lib/* $pkgdir/usr/lib
-  install -m755 Bin/* $pkgdir/usr/bin
-
-  install -d $pkgdir/etc/primesense
-  install -m644 Config/GlobalDefaultsKinect.ini $pkgdir/etc/primesense
-
-  chmod +s $pkgdir/usr/bin/XnSensorServer
-
-  install -m777 -d $pkgdir/var/log/primesense/XnSensorServer
-}
diff --git a/~lukeshu/openni-all/openni-module-sensorkinect-git/sensorkinect.install b/~lukeshu/openni-all/openni-module-sensorkinect-git/sensorkinect.install
deleted file mode 100644
index d62d263d1..000000000
--- a/~lukeshu/openni-all/openni-module-sensorkinect-git/sensorkinect.install
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-export MODULES="libXnDeviceSensorV2KM.so libXnDeviceFile.so"
-
-post_install() {
-	for module in $MODULES; do
-		/usr/bin/niReg -r /usr/lib/$module /etc/primesense
-	done
-}
-
-pre_remove() {
-	for module in $MODULES;	do 
-		/usr/bin/niReg -u /usr/lib/$module
-	done
-}
diff --git a/~lukeshu/openni-all/openni-unstable-git/PKGBUILD b/~lukeshu/openni-all/openni-unstable-git/PKGBUILD
deleted file mode 100644
index 07f276b02..000000000
--- a/~lukeshu/openni-all/openni-unstable-git/PKGBUILD
+++ /dev/null
@@ -1,286 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Contributor: Sven Schneider <archlinux.sandmann@googlemail.com>
-# Contributor: bugix
-# Contributor: Lubosz Sarnecki <lubosz at gmail>
-
-# unfortunately we can't use $_suf in function names, but sed makes it ok
-_suf='-unstable-git'
-pkgname=(
-    openni$_suf
-    openni$_suf-docs
-
-    openni$_suf-core
-    openni$_suf-core-samples
-    openni$_suf-core-samples-source
-    
-    openni$_suf-mono
-    openni$_suf-mono-samples
-    openni$_suf-mono-samples-source
-
-    openni$_suf-java
-    openni$_suf-java-samples
-    openni$_suf-java-samples-source
-    )
-pkgver=20111121
-pkgrel=4
-arch=('i686' 'x86_64')
-url="http://www.openni.org/"
-license=('GPL')
-makedepends=('git' 'doxygen' 'graphviz')
-source=()
-md5sums=()
-
-_gitroot="git://github.com/OpenNI/OpenNI.git"
-_gitname="openni"
-_gitbranch="unstable"
-#_gitbranch="master"
-
-_os='Linux'
-case "${CARCH}" in
-'x86_64') _arch=x86;;
-'i686')   _arch=x86;;
-'arm')    _arch=Arm;; # untested
-*)        _arch=UNSUPPORTED_ARCH;;
-esac
-_platform="${_os}-${_arch}"
-
-export MAKEFLAGS+=' -j1 '
-
-build() {
-  cd "${srcdir}"
-  msg "Connecting to GIT server...."
-
-  if [ -d ${_gitname} ] ; then
-    cd ${_gitname}
-    git checkout master
-    git pull origin
-    msg "The local files are updated."
-  else
-    git clone ${_gitroot} ${_gitname}
-    cd ${_gitname}
-  fi
-  git checkout ${_gitbranch}
-  cd ..
-
-  msg "GIT checkout done or server timeout"
-  msg "Starting make..."
-
-  rm -rf "${srcdir}/${_gitname}-build"
-  git clone "${srcdir}/${_gitname}" "${srcdir}/${_gitname}-build"
-  cd "${srcdir}/${_gitname}-build"
-
-  # PATCH
-  sed -i 's/python /python2 /' "Platform/${_os}/CreateRedist/RedistMaker"
-  echo '
-abs_core: $(ALL_MODULES) $(ALL_UTILS)
-abs_core_samples: $(CORE_SAMPLES)
-abs_java: $(ALL_JAVA_PROJS)
-abs_java_samples: $(JAVA_SAMPLES)
-abs_mono: $(ALL_MONO_PROJS)
-abs_mono_samples: $(MONO_SAMPLES) $(MONO_FORMS_SAMPLES)
-' >> "Platform/${_os}/Build/Makefile"
-
-  
-  # BUILD
-  cd "Platform/${_os}/Build"
-  make -j1 \
-      abs_core abs_core_samples \
-      abs_java abs_java_samples \
-      abs_mono abs_mono_samples || return 1
-
-  cd '../../../Source/DoxyGen'
-  mkdir html
-  doxygen Doxyfile
-  rm -rf html/*.map html*.md5 html/*.hhc html/*.hhp
-}
-
-package_openni-unstable-git() {
-  pkgdesc="Open Natural Interface framework"
-  depends=("openni$_suf-core")
-  optdepends=("openni$_suf-docs: programmer documentation")
-  provides=('openni' 'openni-unstable')
-  conflicts=('openni' 'openni-unstable')
-}
-
-package_openni-unstable-git-docs() {
-  pkgdesc="OpenNI programmer documentation"
-  arch=('any')
-  provides=('openni-docs' 'openni-unstable-docs')
-  conflicts=('openni-docs' 'openni-unstable-docs')
-
-  cd "${srcdir}/${_gitname}-build/Source/DoxyGen/"
-  install -d "${pkgdir}/usr/share/openni"
-  cp -r html "${pkgdir}/usr/share/openni"
-}
-
-package_openni-unstable-git-core() {
-  pkgdesc="OpenNI core libraries"
-  depends=('libusb' 'freeglut')
-  install="openni.install"
-  provides=('openni-core' 'openni-unstable-core')
-  conflicts=('openni-core' 'openni-unstable-core')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release"
-
-  LIB_FILES='
-    libnimCodecs.so
-    libnimMockNodes.so
-    libnimRecorder.so
-    libOpenNI.so
-    '
-  install -d "${pkgdir}/usr/lib"
-  install -m755 $LIB_FILES "${pkgdir}/usr/lib"
-
-  BIN_FILES='niReg niLicense'
-  install -d "${pkgdir}/usr/bin"
-  install -m755 $BIN_FILES "${pkgdir}/usr/bin"
-
-  cd "${srcdir}/${_gitname}-build/Include"
-  install -d "${pkgdir}/usr/include/ni"
-  install -m644 *.h "${pkgdir}/usr/include/ni"
-  cp -r "${_platform}" "${pkgdir}/usr/include/ni"
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Build"
-  install -d "${pkgdir}/usr/share"
-  cp -r Common "${pkgdir}/usr/share/common"
-}
-
-package_openni-unstable-git-java() {
-  pkgdesc="OpenNI java wrapper"
-  depends=("openni$_suf" 'java-environment')
-  provides=('openni-java' 'openni-unstable-java')
-  conflicts=('openni-java' 'openni-unstable-java')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release"
-
-  install -d "${pkgdir}/usr/lib"
-  install -m755 libOpenNI.jni.so "${pkgdir}/usr/lib"
-  
-  install -d "${pkgdir}/usr/share/openni/java"
-  install -m755 org.OpenNI.jar "${pkgdir}/usr/share/openni/java"
-}
-
-package_openni-unstable-git-mono() {
-  pkgdesc="OpenNI mono wrapper"
-  depends=("openni$_suf" 'mono')
-  provides=('openni-mono' 'openni-unstable-mono')
-  conflicts=('openni-mono' 'openni-unstable-mono')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release"
-  
-  install -d "${pkgdir}/usr/share/openni/mono"
-  install -m755 OpenNI.net.dll "${pkgdir}/usr/share/openni/mono"
-}
-
-# SAMPLES
-
-_install_sample_source() {
-  sample=$1
-  makefile="Platform/${_os}/Build/Samples/$sample/Makefile"
-  install -d                "${pkgdir}/usr/share/openni/samples"
-  cp -r "Samples/$sample"   "${pkgdir}/usr/share/openni/samples/$sample"
-  install -m644 "$makefile" "${pkgdir}/usr/share/openni/samples/$sample"
-}
-
-# Leave out NiViewer, it's set up wrong
-CORE_SAMPLES='
-  AudioSample
-  BackRecorder
-  CRead
-  ConvertXToONI
-  RecordSynthetic
-  SimpleCreate
-              SimpleRead SimpleViewer UserTracker'
-MONO_SAMPLES='SimpleRead SimpleViewer UserTracker'
-JAVA_SAMPLES='SimpleRead SimpleViewer UserTracker'
-
-package_openni-unstable-git-core-samples() {
-  pkgdesc="OpenNI sample programs"
-  depends=("openni$_suf-core")
-  optdepends=('openni-core-samples-source: source code for the samples')
-  provides=('openni-core-samples' 'openni-unstable-core-samples')
-  conflicts=('openni-core-samples' 'openni-unstable-core-samples')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release"
-  install -d "${pkgdir}/usr/bin"
-  install -m755 NiViewer "${pkgdir}/usr/bin/niSample-Viewer"
-  for sample in $CORE_SAMPLES; do
-    install -m766 Sample-Ni$sample "${pkgdir}/usr/bin/niSample-$sample"
-  done
-}
-package_openni-unstable-git-core-samples-source() {
-  pkgdesc="OpenNI sample programs source code"
-  depends=("openni$_suf-core")
-  provides=('openni-core-samples-source' 'openni-unstable-core-samples-source')
-  conflicts=('openni-core-samples-source' 'openni-unstable-core-samples-source')
-  options+=('!strip')
-
-  cd "${srcdir}/${_gitname}-build"
-  for sample in Viewer $CORE_SAMPLES; do
-    _install_sample_source Ni$sample
-  done
-}
-
-package_openni-unstable-git-java-samples() {
-  pkgdesc="OpenNI java wrapper sample programs"
-  depends=("openni$_suf-java")
-  optdepends=("openni$_suf-java-samples-source: source code for the samples")
-  arch=('any')
-  provides=('openni-java-samples' 'openni-unstable-java-samples')
-  conflicts=('openni-java-samples' 'openni-unstable-java-samples')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release"
-  install -d "${pkgdir}/usr/bin"
-  install -d "${pkgdir}/usr/share/openni/java"
-  for sample in $JAVA_SAMPLES; do
-    install -m644 org.OpenNI.Samples.$sample.jar "${pkgdir}/usr/share/openni/java"
-    echo "#/bin/sh
-java -jar /usr/share/openni/java/org.OpenNI.Samples.$sample.jar $@
-" > "${pkgdir}/usr/bin/niSample-$sample.jar"
-    chmod 755 "${pkgdir}/usr/bin/niSample-$sample.jar"
-  done
-}
-package_openni-unstable-git-java-samples-source() {
-  pkgdesc="OpenNI java wrapper sample programs source code"
-  depends=("openni$_suf-java")
-  provides=('openni-java-samples-source' 'openni-unstable-java-samples-source')
-  conflicts=('openni-java-samples-source' 'openni-unstable-java-samples-source')
-  options+=('!strip')
-
-  cd "${srcdir}/${_gitname}-build"
-  for sample in $JAVA_SAMPLES; do
-    _install_sample_source $sample.java
-  done
-}
-
-package_openni-unstable-git-mono-samples() {
-  pkgdesc="OpenNI java wrapper sample programs"
-  depends=("openni$_suf-mono")
-  optdepends=("openni$_suf-mono-samples-source: source code for the samples")
-  provides=('openni-mono-samples' 'openni-unstable-mono-samples')
-  conflicts=('openni-mono-samples' 'openni-unstable-mono-samples')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release"
-  install -d "${pkgdir}/usr/bin"
-  install -d "${pkgdir}/usr/share/openni/mono"
-  for sample in $MONO_SAMPLES; do
-    install -m755 $sample.net.exe "${pkgdir}/usr/share/openni/mono"
-    echo "#/bin/sh
-cd /usr/share/openni/mono
-mono $sample.net.exe $@
-" > "${pkgdir}/usr/bin/niSample-$sample.net"
-    chmod 755 "${pkgdir}/usr/bin/niSample-$sample.net"
-  done
-}
-package_openni-unstable-git-mono-samples-source() {
-  pkgdesc="OpenNI mono wrapper sample programs source code"
-  depends=("openni$_suf-mono")
-  provides=('openni-mono-samples-source' 'openni-unstable-mono-samples-source')
-  conflicts=('openni-mono-samples-source' 'openni-unstable-mono-samples-source')
-  options+=('!strip')
-
-  cd "${srcdir}/${_gitname}-build"
-  for sample in $MONO_SAMPLES; do
-    _install_sample_source $sample.net
-  done
-}
diff --git a/~lukeshu/openni-all/openni-unstable-git/openni.install b/~lukeshu/openni-all/openni-unstable-git/openni.install
deleted file mode 100644
index 8470f4512..000000000
--- a/~lukeshu/openni-all/openni-unstable-git/openni.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	MODULES="libnimMockNodes.so libnimCodecs.so libnimRecorder.so"
-	for module in $MODULES
-	do 
-		/usr/bin/niReg /usr/lib/$module
-	done
-}
-
-pre_remove() {
-	rm /var/lib/ni/modules.xml
-}
diff --git a/~lukeshu/openni-all/openni-unstable/PKGBUILD b/~lukeshu/openni-all/openni-unstable/PKGBUILD
deleted file mode 100644
index 19d1575a1..000000000
--- a/~lukeshu/openni-all/openni-unstable/PKGBUILD
+++ /dev/null
@@ -1,294 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Contributor: Sven Schneider <archlinux.sandmann@googlemail.com>
-# Contributor: bugix
-# Contributor: Lubosz Sarnecki <lubosz at gmail>
-
-# unfortunately we can't use $_suf in function names, but sed makes it ok
-_suf='-unstable'
-pkgname=(
-    openni$_suf
-    openni$_suf-docs
-
-    openni$_suf-core
-    openni$_suf-core-samples
-    openni$_suf-core-samples-source
-    
-    openni$_suf-mono
-    openni$_suf-mono-samples
-    openni$_suf-mono-samples-source
-
-    openni$_suf-java
-    openni$_suf-java-samples
-    openni$_suf-java-samples-source
-    )
-pkgver=1.4.0.2
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://www.openni.org/"
-license=('GPL')
-makedepends=('git' 'doxygen' 'graphviz')
-options+=('!strip')
-source=()
-md5sums=()
-
-__gitroot="git://github.com/OpenNI/OpenNI.git"
-_gitname="openni"
-_gitbranch="Unstable-$pkgver"
-
-_os='Linux'
-case "${CARCH}" in
-'x86_64') _arch=x64;;
-'i686')   _arch=x86;;
-'arm')    _arch=Arm;; # untested
-*)        _arch=UNSUPPORTED_ARCH;;
-esac
-_platform="${_os}-${_arch}"
-
-export MAKEFLAGS+=' -j1 '
-
-build() {
-  cd "${srcdir}"
-  msg "Connecting to GIT server...."
-
-  #if [ -d ${_gitname} ] ; then
-    cd ${_gitname}
-  #  git checkout master
-  #  git pull origin
-  #  msg "The local files are updated."
-  #else
-  #  git clone ${__gitroot} ${_gitname}
-  #  cd ${_gitname}
-  #fi
-  git checkout ${_gitbranch}
-  cd ..
-
-  msg "GIT checkout done or server timeout"
-  msg "Starting build..."
-
-  #rm -rf "${srcdir}/${_gitname}-build"
-  #git clone "${srcdir}/${_gitname}" "${srcdir}/${_gitname}-build"
-  cd "${srcdir}/${_gitname}-build"
-
-  # PATCH
-  sed -i 's/python /python2 /' "Platform/${_os}/CreateRedist/RedistMaker"
-
-  for sample in NiViewer NiSimpleViewer NiUserTracker NiUserSelection NiHandTracker; do
-      echo 'USED_LIBS += GL' >> "Platform/${_os}/Build/Samples/${sample}/Makefile"
-  done
-
-  echo '
-abs_core: $(ALL_MODULES) $(ALL_UTILS)
-abs_core_samples: $(CORE_SAMPLES)
-abs_java: $(ALL_JAVA_PROJS)
-abs_java_samples: $(JAVA_SAMPLES)
-abs_mono: $(ALL_MONO_PROJS)
-abs_mono_samples: $(MONO_SAMPLES) $(MONO_FORMS_SAMPLES)
-' >> "Platform/${_os}/Build/Makefile"
-
-  
-  # BUILD
-  cd "Platform/${_os}/Build"
-  make -j1 \
-      abs_core abs_core_samples \
-      abs_java abs_java_samples \
-      abs_mono abs_mono_samples
-  cd "../Bin/${_arch}-Release"
-  ln NiViewer Sample-NiViewer
-
-  cd '../../../Source/DoxyGen'
-  mkdir html
-  doxygen Doxyfile
-  rm -rf html/*.map html*.md5 html/*.hhc html/*.hhp
-}
-
-package_openni-unstable() {
-  pkgdesc="Open Natural Interface framework"
-  depends=("openni$_suf-core")
-  optdepends=("openni$_suf-docs: programmer documentation")
-  provides=('openni')
-  conflicts=('openni')
-}
-
-package_openni-unstable-docs() {
-  pkgdesc="OpenNI programmer documentation"
-  arch=('any')
-  provides=('openni-docs')
-  conflicts=('openni-docs')
-
-  cd "${srcdir}/${_gitname}-build/Source/DoxyGen/"
-  install -d "${pkgdir}/usr/share/openni"
-  cp -r html "${pkgdir}/usr/share/openni"
-}
-
-package_openni-unstable-core() {
-  pkgdesc="OpenNI core libraries"
-  depends=('libusb' 'freeglut')
-  install="openni-core.install"
-  provides=('openni-core')
-  conflicts=('openni-core')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release"
-
-  LIB_FILES='
-    libnimCodecs.so
-    libnimMockNodes.so
-    libnimRecorder.so
-    libOpenNI.so
-    '
-  install -d "${pkgdir}/usr/lib"
-  install -m755 $LIB_FILES "${pkgdir}/usr/lib"
-
-  BIN_FILES='niReg niLicense'
-  install -d "${pkgdir}/usr/bin"
-  install -m755 $BIN_FILES "${pkgdir}/usr/bin"
-
-  cd "${srcdir}/${_gitname}-build/Include"
-  install -d "${pkgdir}/usr/include/ni"
-  install -m644 *.h "${pkgdir}/usr/include/ni"
-  cp -r "${_platform}" "${pkgdir}/usr/include/ni"
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Build"
-  install -d "${pkgdir}/usr/share"
-  cp -r Common "${pkgdir}/usr/share/common"
-
-  install -d "${pkgdir}/var/lib/ni"
-}
-
-package_openni-unstable-java() {
-  pkgdesc="OpenNI java wrapper"
-  depends=("openni$_suf" 'java-environment')
-  provides=('openni-java')
-  conflicts=('openni-java')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release"
-
-  install -d "${pkgdir}/usr/lib"
-  install -m755 libOpenNI.jni.so "${pkgdir}/usr/lib"
-  
-  install -d "${pkgdir}/usr/share/openni/java"
-  install -m755 org.OpenNI.jar "${pkgdir}/usr/share/openni/java"
-}
-
-package_openni-unstable-mono() {
-  pkgdesc="OpenNI mono wrapper"
-  depends=("openni$_suf" 'mono')
-  install="openni-mono.install"
-  provides=('openni-mono')
-  conflicts=('openni-mono')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release"
-  
-  install -d "${pkgdir}/usr/share/openni/mono"
-  install -m755 OpenNI.net.dll "${pkgdir}/usr/share/openni/mono"
-}
-
-# SAMPLES
-
-_install_sample_source() {
-  sample=$1
-  makefile="Platform/${_os}/Build/Samples/$sample/Makefile"
-  install -d                "${pkgdir}/usr/share/openni/samples"
-  cp -r "Samples/$sample"   "${pkgdir}/usr/share/openni/samples/$sample"
-  install -m644 "$makefile" "${pkgdir}/usr/share/openni/samples/$sample"
-}
-
-CORE_SAMPLES='
-  AudioSample
-  BackRecorder
-  CRead
-  ConvertXToONI
-  HandTracker
-  RecordSynthetic
-  SimpleCreate
-  UserSelection
-  Viewer
-              SimpleRead SimpleViewer UserTracker'
-MONO_SAMPLES='SimpleRead SimpleViewer UserTracker'
-JAVA_SAMPLES='SimpleRead SimpleViewer UserTracker'
-
-package_openni-unstable-core-samples() {
-  pkgdesc="OpenNI sample programs"
-  depends=("openni$_suf-core")
-  optdepends=('openni-core-samples-source: source code for the samples')
-  provides=('openni-core-samples')
-  conflicts=('openni-core-samples')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release"
-  install -d "${pkgdir}/usr/bin"
-  for sample in $CORE_SAMPLES; do
-    install -m755 Sample-Ni$sample "${pkgdir}/usr/bin/niSample-$sample"
-  done
-}
-package_openni-unstable-core-samples-source() {
-  pkgdesc="OpenNI sample programs source code"
-  depends=("openni$_suf-core")
-  provides=('openni-core-samples-source')
-  conflicts=('openni-core-samples-source')
-
-  cd "${srcdir}/${_gitname}-build"
-  for sample in Viewer $CORE_SAMPLES; do
-    _install_sample_source Ni$sample
-  done
-}
-
-package_openni-unstable-java-samples() {
-  pkgdesc="OpenNI java wrapper sample programs"
-  depends=("openni$_suf-java")
-  optdepends=("openni$_suf-java-samples-source: source code for the samples")
-  arch=('any')
-  provides=('openni-java-samples')
-  conflicts=('openni-java-samples')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release"
-  install -d "${pkgdir}/usr/bin"
-  install -d "${pkgdir}/usr/share/openni/java"
-  for sample in $JAVA_SAMPLES; do
-    install -m644 org.OpenNI.Samples.$sample.jar "${pkgdir}/usr/share/openni/java"
-    echo "#/bin/sh
-java -jar /usr/share/openni/java/org.OpenNI.Samples.$sample.jar $@
-" > "${pkgdir}/usr/bin/niSample-$sample.jar"
-    chmod 755 "${pkgdir}/usr/bin/niSample-$sample.jar"
-  done
-}
-package_openni-unstable-java-samples-source() {
-  pkgdesc="OpenNI java wrapper sample programs source code"
-  depends=("openni$_suf-java")
-  provides=('openni-java-samples-source')
-  conflicts=('openni-java-samples-source')
-
-  cd "${srcdir}/${_gitname}-build"
-  for sample in $JAVA_SAMPLES; do
-    _install_sample_source $sample.java
-  done
-}
-
-package_openni-unstable-mono-samples() {
-  pkgdesc="OpenNI java wrapper sample programs"
-  depends=("openni$_suf-mono")
-  optdepends=("openni$_suf-mono-samples-source: source code for the samples")
-  provides=('openni-mono-samples')
-  conflicts=('openni-mono-samples')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release"
-  install -d "${pkgdir}/usr/bin"
-  install -d "${pkgdir}/usr/share/openni/mono"
-  for sample in $MONO_SAMPLES; do
-    install -m755 $sample.net.exe "${pkgdir}/usr/share/openni/mono"
-    echo "#/bin/sh
-cd /usr/share/openni/mono
-mono $sample.net.exe $@
-" > "${pkgdir}/usr/bin/niSample-$sample.net"
-    chmod 755 "${pkgdir}/usr/bin/niSample-$sample.net"
-  done
-}
-package_openni-unstable-mono-samples-source() {
-  pkgdesc="OpenNI mono wrapper sample programs source code"
-  depends=("openni$_suf-mono")
-  provides=('openni-mono-samples-source')
-  conflicts=('openni-mono-samples-source')
-
-  cd "${srcdir}/${_gitname}-build"
-  for sample in $MONO_SAMPLES; do
-    _install_sample_source $sample.net
-  done
-}
diff --git a/~lukeshu/openni-all/openni-unstable/openni-core.install b/~lukeshu/openni-all/openni-unstable/openni-core.install
deleted file mode 100644
index 8470f4512..000000000
--- a/~lukeshu/openni-all/openni-unstable/openni-core.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	MODULES="libnimMockNodes.so libnimCodecs.so libnimRecorder.so"
-	for module in $MODULES
-	do 
-		/usr/bin/niReg /usr/lib/$module
-	done
-}
-
-pre_remove() {
-	rm /var/lib/ni/modules.xml
-}
diff --git a/~lukeshu/openni-all/openni-unstable/openni-mono.install b/~lukeshu/openni-all/openni-unstable/openni-mono.install
deleted file mode 100644
index 72a6fb23d..000000000
--- a/~lukeshu/openni-all/openni-unstable/openni-mono.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
-	gacutil -i /usr/share/openni/mono/OpenNI.net.dll -gacdir /usr
-}
-
-post_remove() {
-	gacutil -u OpenNI.net -gacdir /usr
-}
diff --git a/~lukeshu/openni-all/openni/PKGBUILD b/~lukeshu/openni-all/openni/PKGBUILD
deleted file mode 100644
index 2cdc2fd7d..000000000
--- a/~lukeshu/openni-all/openni/PKGBUILD
+++ /dev/null
@@ -1,288 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Contributor: Sven Schneider <archlinux.sandmann@googlemail.com>
-# Contributor: bugix
-# Contributor: Lubosz Sarnecki <lubosz at gmail>
-
-# unfortunately we can't use $_suf in function names, but sed makes it ok
-_suf=''
-pkgname=(
-    openni$_suf
-    openni$_suf-docs
-
-    openni$_suf-core
-    openni$_suf-core-samples
-    openni$_suf-core-samples-source
-    
-    openni$_suf-mono
-    openni$_suf-mono-samples
-    openni$_suf-mono-samples-source
-
-    openni$_suf-java
-    openni$_suf-java-samples
-    openni$_suf-java-samples-source
-    )
-pkgver=1.3.3.6
-pkgrel=4
-arch=('i686' 'x86_64')
-url="http://www.openni.org/"
-license=('GPL')
-makedepends=('git' 'doxygen' 'graphviz')
-source=()
-md5sums=()
-
-__gitroot="git://github.com/OpenNI/OpenNI.git"
-_gitname="openni"
-#_gitbranch="unstable"
-#_gitbranch="master"
-_gitbranch="Stable-$pkgver"
-
-_os='Linux'
-case "${CARCH}" in
-'x86_64') _arch=x86;;
-'i686')   _arch=x86;;
-'arm')    _arch=Arm;; # untested
-*)        _arch=UNSUPPORTED_ARCH;;
-esac
-_platform="${_os}-${_arch}"
-
-export MAKEFLAGS+=' -j1 '
-
-build() {
-  cd "${srcdir}"
-  msg "Connecting to GIT server...."
-
-  if [ -d ${_gitname} ] ; then
-    cd ${_gitname}
-    git checkout master
-    git pull origin
-    msg "The local files are updated."
-  else
-    git clone ${__gitroot} ${_gitname}
-    cd ${_gitname}
-  fi
-  git checkout ${_gitbranch}
-  cd ..
-
-  msg "GIT checkout done or server timeout"
-  msg "Starting make..."
-
-  rm -rf "${srcdir}/${_gitname}-build"
-  git clone "${srcdir}/${_gitname}" "${srcdir}/${_gitname}-build"
-  cd "${srcdir}/${_gitname}-build"
-
-  # PATCH
-  sed -i 's/python /python2 /' "Platform/${_platform}/CreateRedist/RedistMaker"
-  mv Wrappers/OpenNI.java/src/org/OpenNI/AlternativeView{p,P}ointCapability.java
-  echo '
-abs_core: $(ALL_MODULES) $(ALL_UTILS)
-abs_core_samples: $(CORE_SAMPLES)
-abs_java: $(ALL_JAVA_PROJS)
-abs_java_samples: $(JAVA_SAMPLES)
-abs_mono: $(ALL_MONO_PROJS)
-abs_mono_samples: $(MONO_SAMPLES) $(MONO_FORMS_SAMPLES)
-' >> "Platform/${_platform}/Build/Makefile"
-
-  
-  # BUILD
-  cd "Platform/${_platform}/Build"
-  make -j1 \
-      abs_core abs_core_samples \
-      abs_java abs_java_samples \
-      abs_mono abs_mono_samples || return 1
-
-  cd '../../../Source/DoxyGen'
-  mkdir html
-  doxygen Doxyfile
-  rm -rf html/*.map html*.md5 html/*.hhc html/*.hhp
-}
-
-package_openni() {
-  pkgdesc="Open Natural Interface framework"
-  depends=("openni$_suf-core")
-  optdepends=("openni$_suf-docs: programmer documentation")
-  provides=('openni')
-  conflicts=('openni')
-}
-
-package_openni-docs() {
-  pkgdesc="OpenNI programmer documentation"
-  arch=('any')
-  provides=('openni-docs')
-  conflicts=('openni-docs')
-
-  cd "${srcdir}/${_gitname}-build/Source/DoxyGen/"
-  install -d "${pkgdir}/usr/share/openni"
-  cp -r html "${pkgdir}/usr/share/openni"
-}
-
-package_openni-core() {
-  pkgdesc="OpenNI core libraries"
-  depends=('libusb' 'freeglut')
-  install="openni.install"
-  provides=('openni-core')
-  conflicts=('openni-core')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release"
-
-  LIB_FILES='
-    libnimCodecs.so
-    libnimMockNodes.so
-    libnimRecorder.so
-    libOpenNI.so
-    '
-  install -d "${pkgdir}/usr/lib"
-  install -m755 $LIB_FILES "${pkgdir}/usr/lib"
-
-  BIN_FILES='niReg niLicense'
-  install -d "${pkgdir}/usr/bin"
-  install -m755 $BIN_FILES "${pkgdir}/usr/bin"
-
-  cd "${srcdir}/${_gitname}-build/Include"
-  install -d "${pkgdir}/usr/include/ni"
-  install -m644 *.h "${pkgdir}/usr/include/ni"
-  cp -r "${_platform}" "${pkgdir}/usr/include/ni"
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Build"
-  install -d "${pkgdir}/usr/share"
-  cp -r Common "${pkgdir}/usr/share/common"
-}
-
-package_openni-java() {
-  pkgdesc="OpenNI java wrapper"
-  depends=("openni$_suf" 'java-environment')
-  provides=('openni-java')
-  conflicts=('openni-java')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release"
-
-  install -d "${pkgdir}/usr/lib"
-  install -m755 libOpenNI.jni.so "${pkgdir}/usr/lib"
-  
-  install -d "${pkgdir}/usr/share/openni/java"
-  install -m755 org.OpenNI.jar "${pkgdir}/usr/share/openni/java"
-}
-
-package_openni-mono() {
-  pkgdesc="OpenNI mono wrapper"
-  depends=("openni$_suf" 'mono')
-  provides=('openni-mono')
-  conflicts=('openni-mono')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release"
-  
-  install -d "${pkgdir}/usr/share/openni/mono"
-  install -m755 OpenNI.net.dll "${pkgdir}/usr/share/openni/mono"
-}
-
-# SAMPLES
-
-_install_sample_source() {
-  sample=$1
-  makefile="Platform/${_platform}/Build/Samples/$sample/Makefile"
-  install -d                "${pkgdir}/usr/share/openni/samples"
-  cp -r "Samples/$sample"   "${pkgdir}/usr/share/openni/samples/$sample"
-  install -m644 "$makefile" "${pkgdir}/usr/share/openni/samples/$sample"
-}
-
-# Leave out NiViewer, it's set up wrong
-CORE_SAMPLES='
-  AudioSample
-  BackRecorder
-  CRead
-  ConvertXToONI
-  RecordSynthetic
-  SimpleCreate
-              SimpleRead SimpleViewer UserTracker'
-MONO_SAMPLES='SimpleRead SimpleViewer UserTracker'
-JAVA_SAMPLES='SimpleRead SimpleViewer UserTracker'
-
-package_openni-core-samples() {
-  pkgdesc="OpenNI sample programs"
-  depends=("openni$_suf-core")
-  optdepends=('openni-core-samples-source: source code for the samples')
-  provides=('openni-core-samples')
-  conflicts=('openni-core-samples')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release"
-  install -d "${pkgdir}/usr/bin"
-  install -m755 NiViewer "${pkgdir}/usr/bin/niSample-Viewer"
-  for sample in $CORE_SAMPLES; do
-    install -m766 Sample-Ni$sample "${pkgdir}/usr/bin/niSample-$sample"
-  done
-}
-package_openni-core-samples-source() {
-  pkgdesc="OpenNI sample programs source code"
-  depends=("openni$_suf-core")
-  provides=('openni-core-samples-source')
-  conflicts=('openni-core-samples-source')
-  options+=('!strip')
-
-  cd "${srcdir}/${_gitname}-build"
-  for sample in Viewer $CORE_SAMPLES; do
-    _install_sample_source Ni$sample
-  done
-}
-
-package_openni-java-samples() {
-  pkgdesc="OpenNI java wrapper sample programs"
-  depends=("openni$_suf-java")
-  optdepends=("openni$_suf-java-samples-source: source code for the samples")
-  arch=('any')
-  provides=('openni-java-samples')
-  conflicts=('openni-java-samples')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release"
-  install -d "${pkgdir}/usr/bin"
-  install -d "${pkgdir}/usr/share/openni/java"
-  for sample in $JAVA_SAMPLES; do
-    install -m644 org.OpenNI.Samples.$sample.jar "${pkgdir}/usr/share/openni/java"
-    echo "#/bin/sh
-java -jar /usr/share/openni/java/org.OpenNI.Samples.$sample.jar $@
-" > "${pkgdir}/usr/bin/niSample-$sample.jar"
-    chmod 755 "${pkgdir}/usr/bin/niSample-$sample.jar"
-  done
-}
-package_openni-java-samples-source() {
-  pkgdesc="OpenNI java wrapper sample programs source code"
-  depends=("openni$_suf-java")
-  provides=('openni-java-samples-source')
-  conflicts=('openni-java-samples-source')
-  options+=('!strip')
-
-  cd "${srcdir}/${_gitname}-build"
-  for sample in $JAVA_SAMPLES; do
-    _install_sample_source $sample.java
-  done
-}
-
-package_openni-mono-samples() {
-  pkgdesc="OpenNI java wrapper sample programs"
-  depends=("openni$_suf-mono")
-  optdepends=("openni$_suf-mono-samples-source: source code for the samples")
-  provides=('openni-mono-samples')
-  conflicts=('openni-mono-samples')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release"
-  install -d "${pkgdir}/usr/bin"
-  install -d "${pkgdir}/usr/share/openni/mono"
-  for sample in $MONO_SAMPLES; do
-    install -m755 $sample.net.exe "${pkgdir}/usr/share/openni/mono"
-    echo "#/bin/sh
-cd /usr/share/openni/mono
-mono $sample.net.exe $@
-" > "${pkgdir}/usr/bin/niSample-$sample.net"
-    chmod 755 "${pkgdir}/usr/bin/niSample-$sample.net"
-  done
-}
-package_openni-mono-samples-source() {
-  pkgdesc="OpenNI mono wrapper sample programs source code"
-  depends=("openni$_suf-mono")
-  provides=('openni-mono-samples-source')
-  conflicts=('openni-mono-samples-source')
-  options+=('!strip')
-
-  cd "${srcdir}/${_gitname}-build"
-  for sample in $MONO_SAMPLES; do
-    _install_sample_source $sample.net
-  done
-}
diff --git a/~lukeshu/openni-all/openni/openni.install b/~lukeshu/openni-all/openni/openni.install
deleted file mode 100644
index 8470f4512..000000000
--- a/~lukeshu/openni-all/openni/openni.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	MODULES="libnimMockNodes.so libnimCodecs.so libnimRecorder.so"
-	for module in $MODULES
-	do 
-		/usr/bin/niReg /usr/lib/$module
-	done
-}
-
-pre_remove() {
-	rm /var/lib/ni/modules.xml
-}