Merge branch 'master' of ssh://gparabola/srv/git/abslibre

191 files changed, 5375 insertions, 1220 deletions

diff --git a/pcr/amsynth/PKGBUILD b/pcr/amsynth/PKGBUILD
index 58c097cf4..7142d6c9f 100644
--- a/pcr/amsynth/PKGBUILD
+++ b/pcr/amsynth/PKGBUILD
@@ -1,26 +1,25 @@
-# Mantainer: Guest One <theguestone at gmail dot com>
+# Maintainer : Guest One <theguestone at gmail dot com>
 
 pkgname=amsynth
-pkgver=1.3.2
+pkgver=1.4.0
 pkgrel=1
 pkgdesc="Analogue Modeling SYNTHesizer"
-arch=('i686')
-url="http://code.google.com/p/amsynth/"
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/$pkgname/"
 license=('GPL')
-depends=('gtkmm' 'jack')
-source=(http://amsynth.googlecode.com/files/amSynth-${pkgver}.tar.gz)
-md5sums=('991329e433bb8c496f9ca5158faf0bca')
+depends=('gtkmm' 'jack' 'liblo' 'ladspa')
+makedepends=('desktop-file-utils' 'dssi' 'libtool')
+install="$pkgname.install"
+source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.gz")
+md5sums=('9193d334c89996cf44e98422e03318bb')
 
 build() {
-  cd ${srcdir}/amSynth-${pkgver}
-
-  sed -i -e 's|/amSynth|/amsynth|' src/main.cc
-
-  autoreconf --force --install
+  cd "$srcdir/$pkgname-$pkgver"
   ./configure --prefix=/usr
   make
+}
 
-  install -Dm755 src/amSynth ${pkgdir}/usr/bin/amSynth
-  mkdir -p ${pkgdir}/usr/share/${pkgname}
-  install -m644 skel/{Controllersrc,presets} ${pkgdir}/usr/share/${pkgname}/
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir/" install
 }
diff --git a/pcr/amsynth/amsynth.install b/pcr/amsynth/amsynth.install
new file mode 100644
index 000000000..e111ef946
--- /dev/null
+++ b/pcr/amsynth/amsynth.install
@@ -0,0 +1,11 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/pcr/babeld/PKGBUILD b/pcr/babeld/PKGBUILD
index e1e3eb0c4..20d442fd6 100644
--- a/pcr/babeld/PKGBUILD
+++ b/pcr/babeld/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer (AUR): Yann Lopez <arch at lonewulf dot net>
 # Maintainer (Parabola): fauno <fauno@parabola.nu>
 pkgname=babeld
-pkgver=1.4.0
+pkgver=1.4.1
 pkgrel=1
 pkgdesc="Loop-free distance-vector routing protocol"
 arch=(i686 x86_64 mips64el)
@@ -28,5 +28,5 @@ package() {
 
   install -Dm 644 LICENCE $pkgdir/usr/share/licenses/$pkgname/LICENCE
 }
-md5sums=('4ad44bca59f594a629306ac5c9b89d57'
+md5sums=('406bbd940e3a9019d832d20e277266f2'
          'SKIP')
diff --git a/pcr/bamf2/PKGBUILD b/pcr/bamf2/PKGBUILD
new file mode 100644
index 000000000..681d3da7e
--- /dev/null
+++ b/pcr/bamf2/PKGBUILD
@@ -0,0 +1,52 @@
+# Maintainer: Ivan de Jesús Pompa García <ivan.pompa@gmx.com>
+# Contributors: niQo ???
+
+pkgname=bamf2
+_dname=bamf
+pkgver=0.2.126
+pkgrel=2
+pkgdesc="Removes the headache of applications matching into a simple DBus daemon and c wrapper library, 0.2 branch"
+arch=('i686' 'x86_64')
+url="https://launchpad.net/bamf"
+license=('GPL')
+depends=('dbus-glib' 'libwnck3' 'libgtop')
+makedepends=('libwnck' 'vala')
+optdepends=('gtk2: GTK+ 2 library')
+options=(!libtool)
+source=(http://launchpad.net/${_dname}/0.2/${pkgver}/+download/${_dname}-${pkgver}.tar.gz)
+md5sums=('709735137e4b028bb94f9e106bb9ac6e')
+
+conflicts=('bamf')
+provides=('bamf')
+
+build() {
+  cd "$srcdir/${_dname}-${pkgver}"
+
+  # Disable building tests
+  sed -i '/tests/ d' Makefile.in
+
+  sed -i -e 's/--c-include/--include/' lib/libbamf/Makefile.in
+  export CFLAGS="$CFLAGS -Wno-deprecated-declarations -Wno-unused-local-typedefs"
+
+  [[ -d build-gtk3 ]] || mkdir build-gtk3
+  pushd build-gtk3
+  ../configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/${_dname} \
+              --disable-static
+  make
+  popd
+
+  [[ -d build-gtk2 ]] || mkdir build-gtk2
+  pushd build-gtk2
+  ../configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/${_dname} \
+              --disable-static --with-gtk=2
+  make -C lib/libbamf
+  popd
+}
+
+package() {
+  cd "$srcdir/${_dname}-${pkgver}/build-gtk3"
+  make DESTDIR="${pkgdir}/" install
+
+  cd "$srcdir/${_dname}-${pkgver}/build-gtk2"
+  make -C lib/libbamf DESTDIR="${pkgdir}" install
+}
diff --git a/pcr/bibletime/PKGBUILD b/pcr/bibletime/PKGBUILD
new file mode 100644
index 000000000..3a2941623
--- /dev/null
+++ b/pcr/bibletime/PKGBUILD
@@ -0,0 +1,39 @@
+# Maintainer: SanskritFritz (gmail)
+# Contributor: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Tobias T. <OldShatterhand at gmx-topmail dot de>
+
+pkgname=bibletime
+pkgver=2.9.2
+pkgrel=10
+pkgdesc="Bible study tool for KDE4"
+arch=('x86_64' 'i686')
+url="http://www.bibletime.info/"
+license=('GPL2')
+depends=('sword' 'openssl' 'clucene' 'qtwebkit')
+makedepends=('cmake')
+install=$pkgname.install
+source=("http://sourceforge.net/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2")
+
+build() {
+	cd "$srcdir/$pkgname-$pkgver"
+
+	CXXFLAGS+=" -fpermissive"
+
+#	rm CMakeCache.txt
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DQT_QMAKE_EXECUTABLE=qmake4 \
+		-DBT_FORCE_USE_QT4=TRUE \
+		"$srcdir/$pkgname-$pkgver"
+	make
+}
+
+package() {
+	cd "$srcdir/$pkgname-$pkgver"
+
+	make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
+sha256sums=('393c77419b0514645cf2417f52d37bdbd604f8eeb37e76355e14c38d896093c8')
diff --git a/pcr/bibletime/bibletime.install b/pcr/bibletime/bibletime.install
new file mode 100644
index 000000000..ad97d7bab
--- /dev/null
+++ b/pcr/bibletime/bibletime.install
@@ -0,0 +1,13 @@
+post_upgrade() {
+  update-desktop-database -q
+}
+
+post_install() {
+  post_upgrade
+}
+
+post_remove() {
+  post_upgrade
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/chiliproject/PKGBUILD b/pcr/chiliproject/PKGBUILD
index 4f933934a..976316dc4 100644
--- a/pcr/chiliproject/PKGBUILD
+++ b/pcr/chiliproject/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
 
 pkgname=chiliproject
 pkgver=3.3.0
diff --git a/pcr/cinepaint-lts/PKGBUILD b/pcr/cinepaint-lts/PKGBUILD
index c680ac904..da085729f 100644
--- a/pcr/cinepaint-lts/PKGBUILD
+++ b/pcr/cinepaint-lts/PKGBUILD
@@ -1,7 +1,7 @@
 # $Id$
 # Maintainer: tobias [tobias.archlinux.org]
 # Contributor: tobias [tobias.justdreams.de]
-# Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
 pkgname=cinepaint-lts
 pkgver=1.0
diff --git a/pcr/cluster-glue/PKGBUILD b/pcr/cluster-glue/PKGBUILD
new file mode 100644
index 000000000..2c45a3b0c
--- /dev/null
+++ b/pcr/cluster-glue/PKGBUILD
@@ -0,0 +1,169 @@
+# Maintainer: Márcio Silva <coadde@lavabit.com>
+
+pkgname=cluster-glue
+_pkgname1=${pkgname::7}
+_pkgname2=${pkgname:8}
+_pkgname=${_pkgname1^}_${_pkgname2^}
+pkgver=1.0.11
+pkgrel=14
+pkgdesc='Set of libraries, tools and utilities suitable for the Heartbeat/Pacemaker cluster stack (Linux-HA)'
+arch=(
+  i686
+  x86_64
+  mips64el
+)
+group=linux-ha
+url=http://$group.org/wiki/$_pkgname
+license=(
+  GPL2
+  LGPL2.1
+)
+depends=(
+  curl
+  dbus-glib
+  glib2
+  libaio
+  libesmtp
+  libltdl
+  libnet
+  libxml2
+  net-snmp
+  openhpi
+  openipmi
+  openssh
+  python2
+  util-linux
+)
+optdepends=net-tools
+makedepends=(
+  help2man
+  libxslt
+  lynx
+  net-tools
+  openssh
+  valgrind
+  w3m
+)
+options=(!libtool)
+provides=(ha-$_pkgname2)
+conflicts=ha-$_pkgname2
+replaces=ha-$_pkgname2
+install=$pkgname.install
+source=(
+  http://hg.$group.org/$_pkgname2/archive/$_pkgname2-$pkgver.tar.bz2
+  ha-log.service
+  fixing-path.sed
+  replace-linux_os-to-gnulinux_os-term.sed
+  replace-opensource-to-free-term.sed
+)
+sha512sums=(
+  35ac8ac555c39f24c11e3a768cc50eba051fe617edf4cdc0429dac73f45a472f144cfe6ec5faff575606f2b04ff76a2f732556d848b61410c2683d93ba928413
+  bb5bc5c5a9347302be583c43b100c0c3760ec4dcc3348a9f9708d5b2c58ec02dd5782c5ac9dcb86223258493ad3fba8ddd8dc5670390f0f602c34869b26bee6d
+  ce58a2af9f32265f12cc4984e9ae7f285fdb7737813ecccc0780015d048938d9dd79278635eb1cc6833f12f37a8c43211fec17411780220cf38fc44b91ecc076
+  e59386aee4db5857fa131798327aa449a5efcd7d50c3ab45dadfa0becc31698a62367ce83b85ca739bdebaad4a9daf96d02c42673a4e26294ec0fa67323fdb5b
+  c82bd919d1cd02afccd10aea3e015f289ac97e387a1485097d681f9161a00c64859a5dce0ed36b98ad6a340264c2d854dcc83e3248e12828795b73c6ff67ef5b
+)
+
+prepare() {
+  export _CLUSTER_USER=hacluster
+  export _CLUSTER_GROUP=haclient
+  _DGID=666
+  _DUID=666
+
+  #verify the cluster user and group
+  if ! getent group $_CLUSTER_GROUP >/dev/null;then
+    msg 'BEFORE COMPILE THIS SOFTWARE YOU MUST CREATE A CLUSTER GROUP, EXECUTE AS ROOT:'
+    echo -e "# groupadd -r -g $_DGID $_CLUSTER_GROUP\n"
+    _EXITCODE=1
+  fi
+  if ! getent passwd $_CLUSTER_USER >/dev/null;then
+    msg 'BEFORE COMPILE THIS SOFTWARE YOU MUST CREATE A CLUSTER USER, EXECUTE AS ROOT:'
+    echo -e "# useradd -r -g $_CLUSTER_GROUP -u $_DUID -d /var/lib/heartbeat/cores/$_CLUSTER_USER -s /sbin/nologin -c \"cluster user\" $_CLUSTER_USER\n"
+    _EXITCODE=1
+  fi
+  if [[ $_EXITCODE -eq 1 ]] ;then
+    return 1
+  fi
+
+  cd $srcdir/Reusable-${_pkgname1^}-Components-$_pkgname2--$_pkgname2-$pkgver
+  sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|;
+          s| -O0||;
+          s|AM_INIT_AUTOMAKE($PACKAGE_NAME, $PACKAGE_VERSION)|AM_INIT_AUTOMAKE|;
+          s|${localstatedir}/lock ${localstatedir}/spool/lock ${localstatedir}/spool/locks ${localstatedir}/lock|/run/lock|;
+          s|/sbin:/usr/sbin:/usr/local/sbin:/usr/local/bin|/usr/bin|;
+         ' configure.ac
+  sed -i 's|INCLUDES|AM_CPPFLAGS|;
+         ' $(grep -rlI INCLUDES | grep Makefile.am)
+
+  # fixing path
+  sed -i -f $srcdir/fixing-path.sed\
+    $(grep -rlI /bin)\
+    $(grep -rlI /sbin)\
+    $(grep -rlI /lib)\
+    $(grep -rlI /var)
+
+  # fixing python2 path
+  sed -i 's|bin/env python|bin/env python2|g;
+          s|bin/python|bin/python2|g;
+         ' $(grep -rlI 'bin/env python')\
+           $(grep -rlI bin/python)
+
+  # remove Linux (OS) term to GNU/Linux (OS) term
+  sed -i -f $srcdir/replace-linux_os-to-gnulinux_os-term.sed\
+    $(grep -rlI Linux)
+
+  # replace Open Source term to Free term
+  sed -i -f $srcdir/replace-opensource-to-free-term.sed\
+    $(grep -rilI 'open.\{0,1\}source')
+#}
+
+#build() { # disabled, due that is needed internet for generating man pages with libxslt.
+  cd $srcdir/Reusable-${_pkgname1^}-Components-$_pkgname2--$_pkgname2-$pkgver
+  setarch $CARCH ./autogen.sh
+  setarch $CARCH ./configure\
+    --sysconfdir=/etc\
+    --prefix=/usr\
+    --exec-prefix=/usr\
+    --bindir=/usr/bin\
+    --sbindir=/usr/bin\
+    --includedir=/usr/include\
+    --oldincludedir=/usr/include\
+    --libdir=/usr/lib\
+    --libexecdir=/usr/lib\
+    --datarootdir=/usr/share\
+    --datadir=/usr/share\
+    --docdir=/usr/share/doc/$pkgname\
+    --dvidir=/usr/share/doc/$pkgname\
+    --htmldir=/usr/share/doc/$pkgname\
+    --pdfdir=/usr/share/doc/$pkgname\
+    --psdir=/usr/share/doc/$pkgname\
+    --infodir=/usr/share/info\
+    --localedir=/usr/share/locale\
+    --mandir=/usr/share/man\
+    --localstatedir=/var\
+    --disable-ansi\
+    --disable-fatal-warnings\
+    --disable-static\
+    --enable-doc\
+    --enable-libnet\
+    --enable-shared\
+    --enable-upstart\
+    --with-daemon-group=haclient\
+    --with-daemon-user=hacluster\
+    --with-ocf-root=/usr/lib/ocf
+  setarch $CARCH make
+}
+
+package() {
+  cd $srcdir/Reusable-${_pkgname1^}-Components-$_pkgname2--$_pkgname2-$pkgver
+  setarch $CARCH make DESTDIR=$pkgdir install
+
+  install -d $pkgdir/usr/lib/systemd/system
+  install -m644 $srcdir/ha-log.service $pkgdir/usr/lib/systemd/system
+
+  msg 'AFTER COMPILE THIS SOFTWARE YOU MUST DELETE A CLUSTER USER AND A CLUSTER GROUP, EXECUTE AS ROOT:'
+  echo -e "# userdel $_CLUSTER_USER"
+  echo -e "# groupdel $_CLUSTER_GROUP"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/ha-glue/ha-glue.install b/pcr/cluster-glue/cluster-glue.install
index abfedb7c4..05e2160d3 100644
--- a/pcr/ha-glue/ha-glue.install
+++ b/pcr/cluster-glue/cluster-glue.install
@@ -1,22 +1,17 @@
 _CLUSTER_USER=hacluster
 _CLUSTER_GROUP=haclient
-_PREFIX=/usr
-_PREFIXETC=/etc
-_PREFIXVAR=/var
-_LCRSODIR=$PREFIX/libexec/lcrso
 _DGID=666
 _DUID=666
+
 pre_install() {
 	getent group $_CLUSTER_GROUP >/dev/null || groupadd -r -g $_DGID $_CLUSTER_GROUP
-	getent passwd $_CLUSTER_USER >/dev/null || useradd -r -g $_CLUSTER_GROUP -u $_DUID -d /var/lib/heartbeat/cores/hacluster -s /sbin/nologin -c "cluster user" ${_CLUSTER_USER}
+	getent passwd $_CLUSTER_USER >/dev/null || useradd -r -g $_CLUSTER_GROUP -u $_DUID -d /var/lib/heartbeat/cores/hacluster -s /sbin/nologin -c 'cluster user' $_CLUSTER_USER
 }
 
 post_install() {
-	echo -e "\nNow you must install ha-resourceagent, ha-heartbeat and ha-pacemaker\n"
-
+	echo -e 'Now you must install ha-resourceagent, ha-heartbeat and ha-pacemaker'
 }
 post_remove() {
-	echo -e "\nDeleting user $_CLUSTER_USER and group $_CLUSTER_GROUP "
-	userdel $_CLUSTER_USER
-	groupdel $_CLUSTER_GROUP
+	echo -e "Deleting user $_CLUSTER_USER and group $_CLUSTER_GROUP"
+	userdel $_CLUSTER_USER && groupdel $_CLUSTER_GROUP
 }
diff --git a/pcr/cluster-glue/fixing-path.sed b/pcr/cluster-glue/fixing-path.sed
new file mode 100644
index 000000000..43ef66253
--- /dev/null
+++ b/pcr/cluster-glue/fixing-path.sed
@@ -0,0 +1,29 @@
+s|/bin/sh|/bin/bash|g;
+s| /bin| /usr/bin|g;
+s|=/bin|=/usr/bin|g;
+s|!/bin|!/usr/bin|g;
+s|:/bin|:/usr/bin|g;
+s|#/bin|#/usr/bin|g;
+s| /sbin| /usr/bin|g;
+s|=/sbin|=/usr/bin|g;
+s|!/sbin|!/usr/bin|g;
+s|:/sbin|:/usr/bin|g;
+s|#/sbin|#/usr/bin|g;
+s| /usr/sbin| /usr/bin|g;
+s|=/usr/sbin|=/usr/bin|g;
+s|!/usr/sbin|!/usr/bin|g;
+s|:/usr/sbin|:/usr/bin|g;
+s|#/usr/sbin|#/usr/bin|g;
+s|:/usr/bin:/usr/bin|:/usr/bin|g;
+s|lib64|lib|g;
+s| /lib| /usr/lib|g;
+s|=/lib|=/usr/lib|g;
+s|#/lib|#/usr/lib|g;
+s| /usr/libexec| /usr/lib|g;
+s|=/usr/libexec|=/usr/lib|g;
+s|#/usr/libexec|#/usr/lib|g;
+s| /usr/var| /var|g;
+s|=/usr/var|=/var|g;
+s|#/usr/var|#/var|g;
+s|/var/lock|/run/lock|g;
+s|/var/run|/run|g;
diff --git a/pcr/cluster-glue/ha-log.service b/pcr/cluster-glue/ha-log.service
new file mode 100644
index 000000000..5115298d7
--- /dev/null
+++ b/pcr/cluster-glue/ha-log.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Non-blocking logging daemon.
+Requires=network.target remote-fs.target
+Before=heartbeat.service openais.service corosync.service
+
+[Service]
+Type=forking
+ExecStart=/usr/lib/heartbeat/ha_logd -d >/dev/null 2>&1
+ExecStop=/usr/lib/heartbeat/ha_logd -k >/dev/null 2>&1
+
+[Install]
+WantedBy=multi-user.target
diff --git a/pcr/cluster-glue/replace-linux_os-to-gnulinux_os-term.sed b/pcr/cluster-glue/replace-linux_os-to-gnulinux_os-term.sed
new file mode 100644
index 000000000..2c9801c11
--- /dev/null
+++ b/pcr/cluster-glue/replace-linux_os-to-gnulinux_os-term.sed
@@ -0,0 +1,73 @@
+s|Linux,|GNU/Linux,|g;
+s|Linux and|GNU/Linux and|g;
+s|Linux distro|GNU/Linux distro|g;
+s|Linux distribution|GNU/Linux distribution|g;
+s|Linux machine|GNU/Linux machine|g;
+s|Linux Only|GNU/Linux Only|g;
+s|Linux only|GNU/Linux only|g;
+s|Linux operating|GNU/Linux operating|g;
+s|Linux OS|GNU/Linux OS|g;
+s|Linux platform|GNU/Linux platform|g;
+s|Linux software|GNU/Linux software|g;
+s|Linux specific|GNU/Linux specific|g;
+s|Linux system|GNU/Linux system|g;
+s|Linux will|GNU/Linux will|g;
+s|# Linux$|# GNU/Linux|g;
+s|# Linux[.]$|# GNU/Linux.|g;
+s|* Linux$|* GNU/Linux|g;
+s|* Linux[.]$|* GNU/Linux.|g;
+s|// Linux$|// GNU/Linux|g;
+s|// Linux[.]$|// GNU/Linux.|g;
+s|, Linux|, GNU/Linux|g;
+s|As Linux|As GNU/Linux|g;
+s|as Linux|as GNU/Linux|g;
+s|And Linux|And GNU/Linux|g;
+s|and Linux|and GNU/Linux|g;
+s|Be Linux|Be GNU/Linux|g;
+s|be Linux|be GNU/Linux|g;
+s|Because Linux|Because GNU/Linux|g;
+s|because Linux|because GNU/Linux|g;
+s|e[.]g[.] Linux|e.g. GNU/Linux|g;
+s|For Linux|For GNU/Linux|g;
+s|for Linux|for GNU/Linux|g;
+s|In Linux|In GNU/Linux|g;
+s|in Linux|in GNU/Linux|g;
+s|Like Linux|Like GNU/Linux|g;
+s|like Linux|like GNU/Linux|g;
+s|non-Linux|non GNU/Linux|g;
+s|Of Linux|Of GNU/Linux|g;
+s|of Linux|of GNU/Linux|g;
+s|On Linux|On GNU/Linux|g;
+s|on Linux|on GNU/Linux|g;
+s|OS type: Linux|OS type: GNU/Linux|g;
+s|Other Linux|Other GNU/Linux|g;
+s|other Linux|other GNU/Linux|g;
+s|The Linux|The GNU/Linux|g;
+s|the Linux|the GNU/Linux|g;
+s|Typically Linux|Typically GNU/Linux|g;
+s|typically Linux|typically GNU/Linux|g;
+s|To Linux|To GNU/Linux|g;
+s|to Linux|to GNU/Linux|g;
+s|Under Linux|Under GNU/Linux|g;
+s|under Linux|under GNU/Linux|g;
+s|e2fsprogs, typically GNU/Linux|e2fsprogs, typically Linux|g;
+s|GNU/GNU|GNU|g;
+s|ArchGNU/Linux|ArchLinux|g;
+s|MkGNU/Linux|MkLinux|g;
+s|GNU/Linux device|Linux device|g;
+s|GNU/Linux Director Daemon|Linux Director Daemon|g;
+s|GNU/Linux is a registered trademark of Linus Torvalds|Linux is a registered trademark of Linus Torvalds|g;
+s|GNU/Linux kernel|Linux kernel|g;
+s|GNU/Linux specific kernel|Linux specific kernel|g;
+s|GNU/Linux Standard Base|Linux Standard Base|g;
+s|GNU/Linux sysfs|Linux sysfs|g;
+s|GNU/Linux Virtual Server|Linux Virtual Server|g;
+s|GNU/Linux Watchdog|Linux Watchdog|g;
+s|GNU/Linux watchdog|Linux watchdog|g;
+s|GNU/LinuxHA|LinuxHA|g;
+s|GNU/Linux-HA|Linux-HA|g;
+s|GNU/LinuxSCSI|LinuxSCSI|g;
+s|HA GNU/Linux|HA Linux|g;
+s|High-Availability GNU/Linux|High-Availability Linux|g;
+s|SEGNU/Linux|SELinux|g;
+s|VA GNU/Linux Cluster|VA Linux Cluster|g;
diff --git a/pcr/cluster-glue/replace-opensource-to-free-term.sed b/pcr/cluster-glue/replace-opensource-to-free-term.sed
new file mode 100644
index 000000000..c086bb91e
--- /dev/null
+++ b/pcr/cluster-glue/replace-opensource-to-free-term.sed
@@ -0,0 +1,19 @@
+s|Open Source Definition (Version [0-9].[0-9])|Free Software Definition|g;
+s|Open Source Definition|Free Software Definition|g;
+s|Open Source Initiative|Free Software Foundation|g;
+s|OSI Certifi|FSF Certif|g;
+s|OSI certifi|FSF certif|g;
+s|opensource[.]org/osd-annotated|gnu.org/philosophy/free-sw.html|g;
+s|opensource[.]org/osd|gnu.org/philosophy/free-sw.html|g;
+s|opensource[.]org/|gnu.org/philosophy/free-sw.html|g;
+s|[ _-].\{1,3\}[ _-][oO][pP][eE][nN].\{0,1\}[sS][oO][uU][rR][cC][eE]||g;
+s|[oO][pP][eE][nN].\{0,1\}[sS][oO][uU][rR][cC][eE][ _-].\{1,3\}[ _-]||g;
+s|OPEN.\{0,1\}SOURCE|FREE|g;
+s|Open.\{0,1\}[sS]ource|Free|g;
+s|open.\{0,1\}[sS]ource|free|g;
+s|Free Development Lab|Open Source Development Lab|g;
+s|free[.]org|opensource.org|g;
+s|gnu[.]org/philosophy/free-sw[.]htmllicenses|opensource.org/licenses|g;
+s|oss[.]software[.]ibm[.]com/developerworks/free|oss.software.ibm.com/developerworks/opensource|g;
+s|oberhumer[.]com/free|oberhumer.com/opensource|g;
+s|free@google[.]com|opensource@google.com|g;
diff --git a/pcr/clusterit/PKGBUILD b/pcr/clusterit/PKGBUILD
index c325a003b..59ef12be3 100644
--- a/pcr/clusterit/PKGBUILD
+++ b/pcr/clusterit/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
 
 pkgname=clusterit
 pkgver=2.5
diff --git a/pcr/collada-dom/PKGBUILD b/pcr/collada-dom/PKGBUILD
index ebcc90448..1b42c921c 100644
--- a/pcr/collada-dom/PKGBUILD
+++ b/pcr/collada-dom/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
 
 pkgname=collada-dom
 pkgver=2.4.0
diff --git a/pcr/corosync/PKGBUILD b/pcr/corosync/PKGBUILD
new file mode 100644
index 000000000..a24064722
--- /dev/null
+++ b/pcr/corosync/PKGBUILD
@@ -0,0 +1,66 @@
+# Maintainer: Márcio Silva <coadde@lavabit.com>
+
+pkgname=corosync
+_pkgflag=lts
+pkgver=2.3.0
+pkgrel=4
+pkgdesc='Cluster engine for nodal communication systems with additional features for implementing high availability within applications'
+arch=(
+  i686
+  x86_64
+  mips64el
+)
+url=http://www.$pkgname.org
+license=BSD
+depends=(
+  dbus
+  libqb
+  libstatgrab
+  net-snmp
+  nss
+)
+optdepends='augeas: for config files'
+makedepends=(
+  augeas
+  doxygen
+  graphviz
+)
+conflicts=$pkgname-$_pkgflag
+options=(!libtool)
+source=http://$pkgname.org/download/$pkgname-$pkgver.tar.gz
+sha512sums=cd2ff5182f0d4827a10d50a211aa073e3d544bf7b98f9b0c834243c0d2cd5446d7950021cb1a21fc16f4951c8b2acf4b75c0b0c72d815b7d67dcba71623d2e51
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  setarch $CARCH ./configure --prefix=/usr\
+    --datarootdir=/usr/share\
+    --disable-coverage\
+    --disable-fatal-warnings\
+    --disable-rdma\
+    --disable-static\
+    --enable-augeas\
+    --enable-dbus\
+    --enable-monitoring\
+    --enable-qdevices\
+    --enable-secure-build\
+    --enable-shared\
+    --enable-snmp\
+    --enable-systemd\
+    --enable-testagents\
+    --enable-watchdog\
+    --enable-xmlconf\
+    --libdir=/usr/lib\
+    --localstatedir=/var\
+    --sbindir=/usr/bin\
+    --sysconfdir=/etc\
+    --with-initddir=/etc/rc.d\
+    --with-systemddir=/usr/lib/systemd/system
+  setarch $CARCH make
+}
+
+package () {
+  cd $srcdir/$pkgname-$pkgver
+  setarch $CARCH make DESTDIR=$pkgdir install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/debootstrap/PKGBUILD b/pcr/debootstrap/PKGBUILD
index e46a7d0b1..d5a45b5b1 100644
--- a/pcr/debootstrap/PKGBUILD
+++ b/pcr/debootstrap/PKGBUILD
@@ -1,9 +1,8 @@
-# $Id$
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
 pkgname=debootstrap
-pkgver=1.0.48
-pkgrel=1
+pkgver=1.0.52
+pkgrel=3
 pkgdesc="A tool used to create a gNewSense or Trisquel base system from scratch, without requiring the availability of dpkg or apt"
 arch=('any')
 license=('GPL')
@@ -13,15 +12,20 @@ source=("http://ftp.debian.org/debian/pool/main/d/${pkgname}/${pkgname}_${pkgver
         'metad'
         'trisquel')
 install="debootstrap.install"
-md5sums=('f75ae43204ed273c7a95c12a5a2f715a'
+md5sums=('97ac467bf63cf066f52d0dd7fcf77e9a'
          '4425300ca68d60fb60a6d699e153a519'
          'b020aa8426e70a6024c8e76312c17d78')
 
 package(){
-  tar -xzf "$srcdir/data.tar.gz" -C "$pkgdir/"
-
+  tar -xzf "${srcdir}/data.tar.gz" -C "${pkgdir}/"
+  # move the executables to /usr/bin
+  mkdir -p ${pkgdir}/usr/bin
+  mv "${pkgdir}/usr/sbin"/* "${pkgdir}/usr/bin/"
+  rmdir "${pkgdir}/usr/sbin"
+  # patch the path to use gNewSense or Trisquel defaults (prevents error in chrooted environment) 
+  sed -i 's|export PATH|export PATH="/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin:/opt/java/jre/bin:/usr/bin/vendor_perl:/usr/bin/core_perl"|' ${pkgdir}/usr/bin/debootstrap
   # doesn't work with gpg 2.x, patch to point to gpg1v
-  sed 's/gpgv/gpg1v/g;' -i "$pkgdir/usr/sbin/debootstrap" "$pkgdir/usr/share/debootstrap/functions"
+  sed 's/gpgv/gpg1v/g;' -i "${pkgdir}/usr/bin/debootstrap" "${pkgdir}/usr/share/debootstrap/functions"
 
   # add gNewSense script
   install -m644  metad        "$pkgdir/usr/share/debootstrap/scripts"
diff --git a/pcr/drumgizmo/PKGBUILD b/pcr/drumgizmo/PKGBUILD
new file mode 100644
index 000000000..d423a6f82
--- /dev/null
+++ b/pcr/drumgizmo/PKGBUILD
@@ -0,0 +1,26 @@
+# Maintainer: Guest One <theguestone at gmail dot com>
+
+pkgname=drumgizmo
+pkgver=0.9.3
+pkgrel=1
+pkgdesc="A drum LV2 plugin and stand-alone application"
+arch=('i686' 'x86_64')
+url="http://www.drumgizmo.org/"
+license=('GPL')
+groups=('lv2-plugins')
+depends=('lv2' 'libsmf' 'libao' 'jack' 'qt4')
+options=('!libtool')
+source=("${url}releases/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz")
+md5sums=('a0aeef33f74792afd528bec21b8d0f6b')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr \
+              --enable-static=no
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir/" install
+}
diff --git a/pcr/drumkv1/PKGBUILD b/pcr/drumkv1/PKGBUILD
new file mode 100644
index 000000000..4a55012f6
--- /dev/null
+++ b/pcr/drumkv1/PKGBUILD
@@ -0,0 +1,31 @@
+# Maintainer: Guest One <theguestone at gmail dot com>
+
+pkgname=drumkv1
+pkgver=0.3.3
+pkgrel=1
+pkgdesc="An old-school drum-kit sampler"
+arch=('i686' 'x86_64')
+url="http://$pkgname.sourceforge.net/$pkgname-index.html"
+license=('GPL')
+groups=('lv2-plugins')
+depends=('jack' 'liblo' 'lv2' 'qt4')
+install="$pkgname.install"
+source=("http://download.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
+md5sums=('d7c7270fdd01552b74eead36dd638ea4')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # x86_64 lib path fix
+  sed -i "s/lib64/lib/" src/src_lv2.pro
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir/" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/drumkv1/drumkv1.install b/pcr/drumkv1/drumkv1.install
new file mode 100644
index 000000000..029294d67
--- /dev/null
+++ b/pcr/drumkv1/drumkv1.install
@@ -0,0 +1,12 @@
+post_install() {
+  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/pcr/ffmpeg-static/PKGBUILD b/pcr/ffmpeg-static/PKGBUILD
deleted file mode 100644
index 1e5634fb6..000000000
--- a/pcr/ffmpeg-static/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id$
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Contributor: Paul Mattal <paul@archlinux.org>
-# Maintainer (Parabola): Márcio Silva    <coadde@lavabit.com>
-
-pkgname=ffmpeg-static
-pkgver=1.0
-pkgrel=2
-epoch=1
-pkgdesc='Complete and free Internet live audio and video broadcasting solution for GNU/Linux, with static library'
-arch=(i686 x86_64 mips64el)
-url=http://${pkgname%-static}.org/
-license=(GPL)
-depends=(alsa-lib bzip2 gsm lame libpulse libtheora libva libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex v4l-utils x264 xvidcore zlib)
-makedepends=(yasm libvdpau)
-provides=(${pkgname%-static})
-conflicts=(${pkgname%-static})
-source=(http://${pkgname%-static}.org/releases/${pkgname%-static}-$pkgver.tar.bz2)
-md5sums=(3ed526cea20c1bffb5a37f7730f710bd)
-
-build() {
-  cd ${pkgname%-static}-$pkgver
-
-  ./configure \
-    --prefix=/usr \
-    --enable-libmp3lame \
-    --enable-libvorbis \
-    --enable-libxvid \
-    --enable-libx264 \
-    --enable-libvpx \
-    --enable-libtheora \
-    --enable-libgsm \
-    --enable-libspeex \
-    --enable-postproc \
-    --enable-shared \
-    --enable-x11grab \
-    --enable-libopencore_amrnb \
-    --enable-libopencore_amrwb \
-    --enable-libschroedinger \
-    --enable-libopenjpeg \
-    --enable-librtmp \
-    --enable-libpulse \
-    --enable-libv4l2 \
-    --enable-gpl \
-    --enable-version3 \
-    --enable-runtime-cpudetect \
-    --disable-debug \
-    --enable-static
-  make
-  make tools/qt-faststart
-  make doc/ff{mpeg,play,server}.1
-}
-
-package() {
-  cd ${pkgname%-static}-$pkgver
-  make DESTDIR="$pkgdir" install install-man
-  install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/frame/PKGBUILD b/pcr/frame/PKGBUILD
new file mode 100644
index 000000000..b67d776ac
--- /dev/null
+++ b/pcr/frame/PKGBUILD
@@ -0,0 +1,32 @@
+# Contributor: Nicolas Quiénot < niQo at aur >
+
+pkgname=frame
+pkgver=2.5.0
+pkgrel=1
+pkgdesc="Frame handles the buildup and synchronization of a set of simultaneous touches."
+arch=(i686 x86_64)
+url="https://launchpad.net/frame"
+license=(GPL)
+depends=('libxi' 'gcc-libs')
+makedepends=('xorg-server-devel' 'asciidoc')
+provides=('utouch-frame')
+conflicts=('utouch-frame')
+replaces=('utouch-frame')
+options=('!libtool')
+source=(http://launchpad.net/$pkgname/trunk/v$pkgver/+download/$pkgname-$pkgver.tar.gz)
+
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir/" install
+}
+
+md5sums=('02baa941091c5d198cd1623b3ad36e68')
diff --git a/pcr/ganglia/PKGBUILD b/pcr/ganglia/PKGBUILD
new file mode 100644
index 000000000..efa005071
--- /dev/null
+++ b/pcr/ganglia/PKGBUILD
@@ -0,0 +1,78 @@
+# Maintainer: Márcio Silva <coadde@lavabit.com>
+
+pkgname=ganglia
+pkgver=3.6.0
+pkgrel=4
+pkgdesc='Scalable distributed monitoring system for high-performance computing systems such as clusters and Grids.'
+arch=(
+  i686
+  x86_64
+  mips64el
+)
+url=http://$pkgname.sourceforge.net/
+license=BSD
+depends=(
+  apr
+  confuse
+  #php-embed
+  python2
+  rrdtool
+)
+install=$pkgname.install
+options=(!libtool)
+optdepends="$pkgname-web: Web frontend"
+backup=(
+  etc/ganglia/gmond.conf
+  etc/ganglia/gmetad.conf
+)
+source=(
+  http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
+  gmetad.service.in
+  gmond.service.in
+)
+sha512sums=(
+  2a05d37787f1440c0c4aa91cdf0f4f4cb39c840b3b0fdcd6fe58cfb5892a75f81d36f6191c83c17558c37154298268df74fa255d2c940a8b84a7bf3ddb102394
+  a42b7dcb7dd81961cc9fef114f8c4c352375ed931dc2ae77b1139c6fde7cbd6544fcb5fe286ff6066ef37696821dc9f6fcab7c6b14d3ebaa59e895219cd89836
+  c362a383cbbaf5540b5d698f664534bd0da73bcc5ee4336c468844ed17706e05450f35e4f6cf969f1d2495c462883873b30e4575b9ee8ded74ab475afda608bb
+)
+
+prepare() {
+  cd $srcdir/$pkgname-$pkgver
+
+  #sed -i 's|sapi/embed/php_embed.h|php/sapi/embed/php_embed.h|' configure
+
+  sed -i 's|nobody|ganglia|' gmetad/gmetad.conf.in
+
+  # FIXME: Hopefully this will soon no longer be required?
+  msg2 'Copying systemd units into source as workaround for bug'
+  cp $srcdir/gmetad.service.in gmetad/gmetad.service.in
+  cp $srcdir/gmond.service.in  gmond/gmond.service.in
+}
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  setarch $CARCH ./configure --prefix=/usr\
+    --enable-gexec\
+    --enable-perl\
+    --enable-setuid=ganglia\
+    --enable-status\
+    --disable-static\
+    --libdir=/usr/lib\
+    --with-gmetad\
+    --with-python=/usr/bin/python2\
+    --sbindir=/usr/bin\
+    --sysconfdir=/etc/ganglia
+#    --enable-php\
+#    --enable-setgid=ganglia\
+  setarch $CARCH make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  setarch $CARCH make DESTDIR=$pkgdir install
+
+  mkdir $pkgdir/usr/lib/$pkgname/python_modules
+
+  msg2 'Generating default gmond.conf'
+  ./gmond/gmond --default_config > $pkgdir/etc/ganglia/gmond.conf
+}
diff --git a/pcr/ganglia/ganglia.install b/pcr/ganglia/ganglia.install
new file mode 100644
index 000000000..6a196af1f
--- /dev/null
+++ b/pcr/ganglia/ganglia.install
@@ -0,0 +1,24 @@
+post_install() {
+  if [ "`vercmp $2 3.4.0`" -lt 0 ]; then
+    echo 'WARNING: The ganglia package has been split. If you use the' \
+         "web frontend, you'll need to install the ganglia-web package as well."
+  fi
+  id ganglia  >& /dev/null
+  if [ $? -ne 0 ]; then
+     echo 'Adding ganglia system group and user...'
+     groupadd -r ganglia && useradd -r -d /var/lib/ganglia -g ganglia -s /bin/false ganglia
+     # Lock the account to prevent logging in
+     passwd -l ganglia &> /dev/null
+  fi
+  install -d -o ganglia -g ganglia /var/lib/ganglia && install -d -o ganglia -g ganglia /var/lib/ganglia/rrds
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  echo 'Removing ganglia system group and user...'
+  userdel ganglia
+  echo 'NOTE: Please remove /var/lib/ganglia manually if it is no longer required.'
+}
diff --git a/pcr/ganglia/gmetad.service.in b/pcr/ganglia/gmetad.service.in
new file mode 100644
index 000000000..a721c2b4c
--- /dev/null
+++ b/pcr/ganglia/gmetad.service.in
@@ -0,0 +1,11 @@
+[Unit]
+Description=Ganglia Meta Daemon
+After=network.target
+
+[Service]
+Type=forking
+PIDFile=/run/gmetad.pid
+ExecStart=/usr/bin/gmetad -p /run/gmetad.pid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/pcr/ganglia/gmond.service.in b/pcr/ganglia/gmond.service.in
new file mode 100644
index 000000000..5cbd31629
--- /dev/null
+++ b/pcr/ganglia/gmond.service.in
@@ -0,0 +1,9 @@
+[Unit]
+Description=Ganglia Monitor Daemon
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/gmond -f -p /run/gmond.pid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/pcr/geis/PKGBUILD b/pcr/geis/PKGBUILD
new file mode 100644
index 000000000..629cb9d12
--- /dev/null
+++ b/pcr/geis/PKGBUILD
@@ -0,0 +1,33 @@
+# Maintainer: Nicolas Quiénot <niQo @ AUR >
+# Contributor: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
+
+pkgname=geis
+pkgver=2.2.15
+pkgrel=3
+pkgdesc="Implementation of the GEIS (Gesture Engine Interface and Support) interface."
+arch=('i686' 'x86_64')
+url="https://launchpad.net/geis"
+license=('GPL' 'LGPL')
+depends=('grail' 'dbus' 'python-gobject')
+makedepends=('xorg-server-devel')
+provides=('utouch-geis')
+conflicts=('utouch-geis')
+replaces=('utouch-geis')
+options=('!emptydirs' '!libtool')
+source=("http://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz")
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ## add -Wno-format in CFLAGS see FS#34658
+  CFLAGS="$CFLAGS -Wno-format" ./configure --prefix=/usr --disable-static
+  make 
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="${pkgdir}/" install
+}
+
+md5sums=('94c8a08497f5fc22061fb0573ca1e220')
diff --git a/pcr/gimp-art/PKGBUILD b/pcr/gimp-art/PKGBUILD
index 11c3b191b..cd38b329d 100644
--- a/pcr/gimp-art/PKGBUILD
+++ b/pcr/gimp-art/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
 
 pkgname=gimp-art
 pkgver=2.8.2
diff --git a/pcr/gimp-art/gimp-splash-artwork.license b/pcr/gimp-art/gimp-splash-artwork.license
index 64267a6c0..0f060c013 100644
--- a/pcr/gimp-art/gimp-splash-artwork.license
+++ b/pcr/gimp-art/gimp-splash-artwork.license
@@ -1,7 +1,7 @@
 GIMP LIBRE SPLASH LICENSE
 
-Logo and Effects is created by Zé Lara <ze.lara@adinet.com.uy> and Márcio Silva <coadde@adinet.com.uy>
-Idea by André Silva <andre.paulista@adinet.com.uy>
+Logo and Effects is created by Zé Lara <ze.miguel.lara@gmail.com> and Márcio Silva <coadde@lavabit.com>
+Idea by André Silva <emulatorman@lavabit.com>
 
 The GIMP LIBRE splash screen is licensed under the Creative Commons Attribution-ShareAlike 3.0 Unported License. 
 To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/3.0/ or send aletter to Creative Commons, 444 Castro Street,
@@ -10,4 +10,4 @@ Suite 900, Mountain View, California, 94041, USA.
 Sangeno Waterfall Picture is created by Abedinali from Wikimedia Commons under the Creative Commons CC0 1.0 Universal license (Public Domain).
 To the extent possible under law, Abedinali from Wikimedia Commons has waived all copyright and related or neighboring rights to Sangeno Waterfall. 
 This work is published from: United States. 
-https://upload.wikimedia.org/wikipedia/commons/8/8b/Sangeno.jpg
\ No newline at end of file
+https://upload.wikimedia.org/wikipedia/commons/8/8b/Sangeno.jpg
diff --git a/pcr/gimp-toolkit-gps/PKGBUILD b/pcr/gimp-toolkit-gps/PKGBUILD
new file mode 100644
index 000000000..9f5784608
--- /dev/null
+++ b/pcr/gimp-toolkit-gps/PKGBUILD
@@ -0,0 +1,53 @@
+# Maintainer: Márcio Silva <coadde@lavabit.com>
+
+pkgname=gimp-toolkit-gps
+_pkgname=${pkgname:13}
+_reqname=${pkgname::4}
+pkgver=2.0
+_pkgver=${pkgver/./_}
+pkgrel=1
+_pkgsrc1=${_pkgname^^}%20$_pkgver%20final
+_pkgsrc2=${_pkgname^^}%20extras
+pkgdesc='GIMP Paint Studio is a collection of brushes and accompanying tool presets. highly useful feature of the GIMP.'
+arch=any
+license=(
+  GPL2
+  CCPL:by-sa
+)
+url=https://code.google.com/p/$_pkgname-gimp-paint-studio
+depends=gimp
+conflicts=${pkgname/kit/set}
+replaces=${pkgname/kit/set}
+makedepends=unzip-libre
+noextract=(
+  $_pkgsrc1.zip
+  $_pkgsrc2.zip
+)
+source=(
+  https://$_pkgname-gimp-paint-studio.googlecode.com/files/$_pkgsrc1.zip
+  https://$_pkgname-gimp-paint-studio.googlecode.com/files/$_pkgsrc2.zip
+)
+sha512sums=(
+  b06016eab194db7862590940c6fb7e9c14bbb6d3ce83c2b85293da2c75ecf8b9e64585a38f749da36d63e2711a25a0073415568f10be4b997120d93ba2b5c112
+  c3ef322898299bde60f2c8e29ebdd5fa47236f6b2859bf5d3d01a92290e1ad888ba71b0813f7325921c87bf57632cf794da31e8ccab0c46cb020be52d2c1135f
+)
+
+prepare() {
+  a=$srcdir/$_pkgname-$pkgver
+  mkdir $a
+  unzip $srcdir/$_pkgsrc1.zip -d $a
+  unzip $srcdir/$_pkgsrc2.zip -d $a
+  # drop useless splashes
+  rm -v $a/splashes/* && rmdir -v $a/splashes
+  # fix perm for custom umask
+  find $srcdir/$_pkgname-$pkgver -type d -exec chmod 0755 -R {} \; &&\
+    find $srcdir/$_pkgname-$pkgver -type f -exec chmod 0644 -R {} \;
+}
+
+package() {
+  b=$pkgdir/usr/share/gimp/2.0
+  install -d $b
+  cp -va $srcdir/$_pkgname-$pkgver/* $b
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/ginn/PKGBUILD b/pcr/ginn/PKGBUILD
new file mode 100644
index 000000000..013fc8642
--- /dev/null
+++ b/pcr/ginn/PKGBUILD
@@ -0,0 +1,21 @@
+# Maintainer: Nicolas Quiénot <niQo @ aur>
+
+pkgname=ginn
+pkgver=0.2.6
+pkgrel=2
+pkgdesc="A deamon with jinn-like wish-granting capabilities"
+url="http://launchpad.net/ginn"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('geis' 'bamf2' 'libxtst' 'libwnck')
+source=(http://launchpad.net/ginn/0.x/${pkgver}/+download/ginn-${pkgver}.tar.gz)
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  ./configure --prefix=/usr
+  make || return 1
+  make DESTDIR=${pkgdir} install || return 1
+}
+
+md5sums=('008854147f0809877b3e7ccf5af5337f')
diff --git a/pcr/gitflow/PKGBUILD b/pcr/gitflow/PKGBUILD
new file mode 100644
index 000000000..b62042262
--- /dev/null
+++ b/pcr/gitflow/PKGBUILD
@@ -0,0 +1,34 @@
+# Maintainer: Techlive Zheng <techlivezheng@gmail.com>
+# Contributor: Ernie Brodeur <ebrodeur@ujami.net>
+
+pkgname=gitflow
+pkgver=0.4.1
+pkgrel=3
+pkgdesc='Extend git with the Gitflow branching model.'
+arch=('any')
+url='https://github.com/nvie/gitflow'
+license=('BSD')
+depends=('git' 'shflags')
+source=("https://github.com/nvie/gitflow/tarball/${pkgver}/${pkgname}-${pkgver}.tar.gz")
+md5sums=('adc7a52512052938a9b42ac8bd7d91dd')
+
+prepare() {
+  cd $srcdir/`find . -maxdepth 1 -type d -name nvie\*`
+  sed -i "s:\$GITFLOW_DIR/gitflow-shFlags:/usr/share/lib/shflags/shflags.sh:" git-flow
+}
+
+package() {
+  cd $srcdir/`find . -maxdepth 1 -type d -name nvie\*`
+
+  install -d -m 0755 $pkgdir/usr/lib/git-core
+  install -m 0755 git-flow $pkgdir/usr/lib/git-core
+  install -m 0644 git-flow-feature \
+                  git-flow-hotfix \
+                  git-flow-release \
+                  git-flow-support \
+                  git-flow-version \
+                  git-flow-init \
+                  gitflow-common \
+                  $pkgdir/usr/lib/git-core/
+}
+md5sums=('adc7a52512052938a9b42ac8bd7d91dd')
diff --git a/pcr/gnuhealth/PKGBUILD b/pcr/gnuhealth/PKGBUILD
index 695062e5b..3eaee88d0 100644
--- a/pcr/gnuhealth/PKGBUILD
+++ b/pcr/gnuhealth/PKGBUILD
@@ -1,13 +1,13 @@
-# Maintainer: SpepS <dreamspepser at yahoo dot it>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer: André Silva <emulatorman@lavabit.com>
+# Contributor: SpepS <dreamspepser at yahoo dot it>
 
 pkgname=gnuhealth
-pkgver=1.8.1
-pkgrel=3
+pkgver=2.0.0
+pkgrel=1
 pkgdesc="A free Health and Hospital Information System"
-arch=(any)
-url="http://health.gnu.org/"
-license=('GPL3')
+arch=any
+url=http://health.gnu.org/
+license=GPL3
 depends=(
           postgresql
           pygtk
@@ -26,33 +26,48 @@ depends=(
           trytond-country
           trytond-stock-lot
 )
-source=("http://ftp.gnu.org/gnu/health/$pkgname-$pkgver.tar.gz")
-md5sums=('d3837242011df1d39ce7a0f1d6e6a46a')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # python2 fixes
-  export PYTHON=python2
-
-  # mv man file
-  mv health/man .
-
-  ./configure --prefix=/usr
-}
+source=http://ftp.gnu.org/gnu/health/$pkgname-$pkgver.tar.gz
+sha512sums=5d528fe4a20a2b237f32d023f44e898a012f47f9ba83611f71fba386990bf98dbbdb1fb9c5b78dd5a3b65c6fe9b2fe4e7e472fec90cab009e5b8e31b1f31ceeb
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make MANTARGET="$pkgdir/usr/share/man/man1" \
-       DESTDIR="$pkgdir/" install
+  MODULES=(
+           health 
+           health_calendar 
+           health_genetics
+           health_gyneco
+           health_history 
+           health_icd10
+           health_icd10pcs
+           health_icu
+           health_inpatient
+           health_inpatient_calendar
+           health_lab
+           health_lifestyle
+           health_mdg6
+           health_ntd
+           health_ntd_chagas
+           health_nursing
+           health_pediatrics
+           health_profile
+           health_qrcodes
+           health_reporting
+           health_services
+           health_socioeconomics
+           health_stock
+           health_surgery
+           health_who_essential_medicines
+  )
 
-  # man
-  install -Dm644 man/$pkgname.1 \
-    "$pkgdir/usr/share/man/man1/$pkgname.1"
+  # build gnuhealth modules
+    for module in ${MODULES[@]}
+    do
+      cd $srcdir/$pkgname-$pkgver/$module
+      python2 setup.py install --root=$pkgdir
+    done
 
-  # python2 fix
-  sed -i 's/env python/&2/' \
-    `grep -rl 'env python' "$pkgdir"`
-}
+  # put gnuhealth manual to man folder
+    cd "$srcdir/$pkgname-$pkgver"
 
-# vim:set ts=2 sw=2 et:
+    install -Dm644 health/man/$pkgname.1 \
+      $pkgdir/usr/share/man/man1/$pkgname.1
+}
diff --git a/pcr/grail/PKGBUILD b/pcr/grail/PKGBUILD
new file mode 100644
index 000000000..c76d2214f
--- /dev/null
+++ b/pcr/grail/PKGBUILD
@@ -0,0 +1,34 @@
+# Maintainer: Nicolas Quiénot <niQo @ aur>
+# Contributor: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
+# Contributor: thn81 <root@scrat>
+
+pkgname=grail
+pkgver=3.1.0
+pkgrel=1
+pkgdesc="Gesture Recognition And Instantiation Library"
+arch=('i686' 'x86_64')
+url="https://launchpad.net/grail"
+license=('GPL')
+depends=('frame>=2.5.0' 'libxi')
+makedepends=('inputproto')
+conflicts=('utouch-grail')
+replaces=('utouch-grail')
+options=('!libtool')
+source=("http://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz")
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # Static library needed for tests
+  ./configure --prefix=/usr # --disable-static
+  MAKEFLAGS="-j1"
+  make ${MAKEFLAGS}
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}/" install
+}
+
+md5sums=('f0f8c56430ee3717778dec6452201c33')
diff --git a/pcr/gtk-theme-numix/PKGBUILD b/pcr/gtk-theme-numix/PKGBUILD
new file mode 100644
index 000000000..4c4c10b20
--- /dev/null
+++ b/pcr/gtk-theme-numix/PKGBUILD
@@ -0,0 +1,21 @@
+# Mantainer: Diego
+# Contributor: Aleessio Sergi
+
+pkgname=gtk-theme-numix
+_theme=Numix
+pkgver=1.4
+pkgrel=1
+pkgdesc="A flat and light theme with a modern look"
+arch=('any')
+url="http://satya164.deviantart.com/art/Numix-GTK3-theme-360223962"
+license=('GPL3')
+depends=('gtk-engine-murrine')
+source=(https://github.com/shimmerproject/${_theme}/archive/v${pkgver}.tar.gz)
+md5sums=('323ce459ebf9ee30bf920d18fab3645a')
+
+package() {
+  install -d "$pkgdir/usr/share/themes/${_theme}"
+  cp -rv ${srcdir}/${_theme}-${pkgver}/* "$pkgdir/usr/share/themes/${_theme}/"
+}
+
+md5sums=('323ce459ebf9ee30bf920d18fab3645a')
diff --git a/pcr/ha-glue/PKGBUILD b/pcr/ha-glue/PKGBUILD
deleted file mode 100644
index 06385e9cf..000000000
--- a/pcr/ha-glue/PKGBUILD
+++ /dev/null
@@ -1,106 +0,0 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-
-pkgname=ha-glue
-_pkgname=${pkgname:3}
-pkgver=1.0.11
-pkgrel=5
-pkgdesc='A set of libraries, tools and utilities suitable for the Heartbeat/Pacemaker cluster stack'
-arch=(
-  i686
-  x86_64
-  mips64el
-)
-url=http://linux-ha.org/wiki/Cluster_${_pkgname^}
-license=(
-  GPL2
-  LGPL2.1
-)
-depends=(
-  curl
-  glib2
-  libaio
-  libesmtp
-  libxml2
-  net-snmp
-  python
-  util-linux
-)
-optdepends=(
-  #lynx
-  net-tools
-  openssh
-  #valgrind
-  #w3m
-)
-makedepends=(
-  help2man
-  libxslt
-  #lynx
-  net-tools
-  openssh
-  #valgrind
-  #w3m
-)
-options=!libtool
-install=$pkgname.install
-source=(
-  http://hg.linux-ha.org/$_pkgname/archive/$_pkgname-$pkgver.tar.bz2
-  ha-log.service
-)
-sha512sums=(
-  35ac8ac555c39f24c11e3a768cc50eba051fe617edf4cdc0429dac73f45a472f144cfe6ec5faff575606f2b04ff76a2f732556d848b61410c2683d93ba928413
-  9252472a6d7a1bbad765c63becdec4064d882b1eb98abdf27833a6e06d8750f06663b2460d32a4c72d04f10a7480ef0a2093b8a18b4d1fc62a989cde54ee056a
-)
-
-prepare() {
-  export _CLUSTER_USER=hacluster
-  export _CLUSTER_GROUP=haclient
-  _DGID=666
-  _DUID=666
-
-  #verify the cluster user and group
-  if ! getent group $_CLUSTER_GROUP >/dev/null;then
-    msg 'BEFORE COMPILE THIS SOFTWARE YOU MUST CREATE A CLUSTER GROUP, EXECUTE AS ROOT:'
-    echo -e "# groupadd -r -g $_DGID $_CLUSTER_GROUP\n"
-    _EXITCODE=1
-  fi
-  if ! getent passwd $_CLUSTER_USER >/dev/null;then
-    msg 'BEFORE COMPILE THIS SOFTWARE YOU MUST CREATE A CLUSTER USER, EXECUTE AS ROOT:'
-    echo -e "# useradd -r -g $_CLUSTER_GROUP -u $_DUID -d /var/lib/heartbeat/cores/$_CLUSTER_USER -s /sbin/nologin -c \"cluster user\" $_CLUSTER_USER\n"
-    _EXITCODE=1
-  fi
-  if [[ $_EXITCODE -eq 1 ]] ;then
-    return 1
-  fi
-
-  cd $srcdir/Reusable-Cluster-Components-$_pkgname--$_pkgname-$pkgver
-  sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|' configure.ac
-}
-
-build() {
-  cd $srcdir/Reusable-Cluster-Components-$_pkgname--$_pkgname-$pkgver
-  setarch $CARCH ./autogen.sh
-  setarch $CARCH ./configure --prefix=/usr\
-    --enable-fatal-warnings=no\
-    --enable-static=no\
-    --libdir=/usr/lib\
-    --localstatedir=/var\
-    --sysconfdir=/etc\
-    --with-daemon-group=haclient\
-    --with-daemon-user=hacluster
-  setarch $CARCH make
-}
-
-package() {
-  cd $srcdir/Reusable-Cluster-Components-$_pkgname--$_pkgname-$pkgver
-  setarch $CARCH make DESTDIR=$pkgdir install
-
-  install -d $pkgdir/usr/lib/systemd/system
-  install -Dm644 $srcdir/ha-log.service $pkgdir/usr/lib/systemd/system
-
-  msg 'AFTER COMPILE THIS SOFTWARE YOU MUST DELETE A CLUSTER USER AND A CLUSTER GROUP, EXECUTE AS ROOT:'
-  echo -e "# userdel $_CLUSTER_USER"
-  echo -e "# groupdel $_CLUSTER_GROUP"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/ha-glue/ha-logd.service b/pcr/ha-glue/ha-logd.service
deleted file mode 100644
index 1847d8cdd..000000000
--- a/pcr/ha-glue/ha-logd.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Startup script logd service.
-Requires=network.target remote-fs.target
-
-[Service]
-Type=forking
-ExecStart=/usr/lib/heartbeat/ha_logd
-
-[Install]
-WantedBy=multi-user.target
diff --git a/pcr/ha-heartbeat/PKGBUILD b/pcr/ha-heartbeat/PKGBUILD
deleted file mode 100644
index 10ef5def3..000000000
--- a/pcr/ha-heartbeat/PKGBUILD
+++ /dev/null
@@ -1,66 +0,0 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-
-pkgname=ha-heartbeat
-_pkgname=${pkgname:3}
-pkgver=3.0.5
-_pkgver=${pkgver::1}_${pkgver:2:1}
-pkgrel=2
-pkgdesc='Daemon that provides cluster infrastructure services to its clients'
-arch=(
-  i686
-  x86_64
-  mips64el
-)
-url=http://linux-ha.org/wiki/${_pkgname^}
-license=GPL
-makedepends=docbook-xsl
-depends=(
-  gnutls
-  ha-glue
-)
-options=(
-  '!emptydirs'
-  '!libtool'
-  strip
-)
-source=(
-  http://hg.linux-ha.org/$_pkgname-STABLE_$_pkgver/archive/STABLE-$pkgver.tar.bz2
-  $pkgname.service
-)
-sha512sums=(
-  e38083b87c56a72eb8925ac42adeabb92618608e92218a63960ec0d0bca264f92a8e9c3ebfb0589cc4538da1a82b268b5cc9ee5a51ed33057c969e694e16b27d
-  d14013b4ee133ed07e17fa6e09cae1f9f7bdbabaadfda9b9bb8ed25d4d5ff2f3d419f344195c6d5211da33293d5fe5ad64dbc8be6e1a02f7fa21563f54907a20
-)
-
-prepare() {
-  cd $srcdir/${_pkgname^}-3-0-STABLE-$pkgver
-  sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|' configure.in
-  mv configure.{in,ac}
-}
-
-build() {
-  cd $srcdir/${_pkgname^}-3-0-STABLE-$pkgver
-  setarch $CARCH ./bootstrap
-  setarch $CARCH ./configure --prefix=/usr\
-    --enable-fatal-warnings=no\
-    --enable-static=no\
-    --libdir=/usr/lib\
-    --sysconfdir=/etc
-  setarch $CARCH make
-}
-
-package() {
-  cd $srcdir/${_pkgname^}-3-0-STABLE-$pkgver
-  setarch $CARCH make DESTDIR=$pkgdir install
-
-  for py in `grep -r -l "\#\!\/usr\/bin\/python" $pkgdir`;do
-    sed -i.bk 's:/usr/bin/python$:/usr/bin/python2:g' $py
-  done
-  for py in `grep -r -l "\#\!\/usr\/bin\/env python" $pkgdir`;do
-    sed -i.bk 's:/usr/bin/env python$:/usr/bin/env python2:g' $py
-  done
-  #end python path correction
-
-  install -d $pkgdir/usr/lib/systemd/system
-  install -Dm644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system
-}
diff --git a/pcr/ha-heartbeat/ha-heartbeat.service b/pcr/ha-heartbeat/ha-heartbeat.service
deleted file mode 100644
index aacde3dbb..000000000
--- a/pcr/ha-heartbeat/ha-heartbeat.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Startup script high-availability services.
-Requires=network.target remote-fs.target timers.target
-
-[Service]
-Type=forking
-ExecStart=/usr/lib/heartbeat/heartbeat
-
-[Install]
-WantedBy=multi-user.target
diff --git a/pcr/ha-resourceagent/PKGBUILD b/pcr/ha-resourceagent/PKGBUILD
deleted file mode 100644
index a1588664b..000000000
--- a/pcr/ha-resourceagent/PKGBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-
-pkgname=ha-resourceagent
-_pkgname=${pkgname:3}
-_xname=${_pkgname::8}
-_yname=${_pkgname:8}
-_Name=${_xname^}_${_yname^}
-_name=${_xname}-${_yname}s
-pkgver=3.9.5
-pkgrel=1
-pkgdesc='A standardized interface for a cluster resource'
-arch=(
-  i686
-  x86_64
-  mips64el
-)
-url=http://linux-ha.org/wiki/$_Name
-license=GPL
-depends=ha-glue
-source=(
-  https://github.com/ClusterLabs/$_name/archive/v$pkgver.tar.gz
-  ha-ldirector.service
-)
-sha512sums=(
-  668955de7a80577a1fb599d03b0a47589a00aed3017b532931b5132b877e45778c590f26d3057ee763c35973b0f6b032e2f74ebdf0b5f45b5e402b0f13b8ff4e
-  9e257b31305657a5164eebf6893d84496ef5dc5e80058dda5cd250c847c8247e10410cca99f0a481fa461487198fa59640e09d1e81fc3199a54f3ec85c56d9a3
-)
-
-prepare() {
-  cd $srcdir/$_name-$pkgver
-  sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|' configure.ac
-}
-
-build() {
-  cd $srcdir/$_name-$pkgver
-  ./autogen.sh
-  ./configure --prefix=/usr\
-    --libdir=/usr/lib\
-    --localstatedir=/var\
-    --sysconfdir=/etc
-  setarch $CARCH make
-}
-
-package() {
-  cd $srcdir/$_name-$pkgver
-  setarch $CARCH make DESTDIR=$pkgdir install
-
-  #python path correction
-  for py in `grep -r -l "\#\!\/usr\/bin\/python" $pkgdir`;do
-    sed -i 's:/usr/bin/python$:/usr/bin/python2:g' $py
-  done
-  for py in `grep -r -l "\#\!\/usr\/bin\/env python" $pkgdir`;do
-    sed -i 's:/usr/bin/env python$:/usr/bin/env python2:g' $py
-  done
-  #end python path correction
-
-  install -d $pkgdir/usr/lib/systemd/system
-  install -Dm644 $srcdir/ha-ldirector.service $pkgdir/usr/lib/systemd/system
-}
diff --git a/pcr/ha-resourceagent/ha-ldirector.service b/pcr/ha-resourceagent/ha-ldirector.service
deleted file mode 100644
index c5809a216..000000000
--- a/pcr/ha-resourceagent/ha-ldirector.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Non-heartbeat systems service, that manages the Linux Virtual Server component for TCP/UDP load-balancing.
-Requires=network.target remote-fs.target
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/ldirectord
-
-[Install]
-WantedBy=multi-user.target
diff --git a/pcr/heartbeat/PKGBUILD b/pcr/heartbeat/PKGBUILD
new file mode 100644
index 000000000..a33250f84
--- /dev/null
+++ b/pcr/heartbeat/PKGBUILD
@@ -0,0 +1,203 @@
+# Maintainer: Márcio Silva <coadde@lavabit.com>
+
+pkgname=heartbeat
+pkgver=3.0.5
+_pkgver=${pkgver::1}_${pkgver:2:1}
+pkgrel=11
+pkgdesc='Daemon that provides cluster infrastructure services to its clients (Linux-HA)'
+arch=(
+  i686
+  x86_64
+  mips64el
+)
+group=linux-ha
+url=http://$group.org/wiki/${pkgname^}
+license=(
+  GPL2
+  lGPL2.1
+)
+depends=(
+  gnutls
+  cluster-glue
+)
+optdepends=net-tools
+makedepends=(
+  docbook-xsl
+  libxslt
+  lynx
+  net-tools
+  openssh
+  swig
+  valgrind
+  w3m
+)
+options=(!libtool)
+provides=(ha-$pkgname)
+conflicts=ha-$pkgname
+replaces=ha-$pkgname
+source=http://hg.$group.org/$pkgname-STABLE_$_pkgver/archive/STABLE-$pkgver.tar.bz2
+sha512sums=e38083b87c56a72eb8925ac42adeabb92618608e92218a63960ec0d0bca264f92a8e9c3ebfb0589cc4538da1a82b268b5cc9ee5a51ed33057c969e694e16b27d
+
+prepare() {
+  cd $srcdir/${pkgname^}-3-0-STABLE-$pkgver
+
+  mv configure.{in,ac}
+
+  sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|;
+          s|AM_INIT_AUTOMAKE(heartbeat, $HAPKGVERSION)|AM_INIT_AUTOMAKE|;
+         ' configure.ac
+  sed -i "s|AC_INIT(GNUmakefile)|AC_INIT(heartbeat, $pkgver)|;
+         " configure.ac
+
+  sed -i 's|INCLUDES|AM_CPPFLAGS|;
+         ' $(grep -rlI INCLUDES | grep Makefile.am)
+
+  # fixing path
+  sed -i 's|bin/sh|usr/bin/bash|;
+         ' $(grep -rlI bin/sh)
+  sed -i 's| /bin| /usr/bin|;
+         ' $(grep -rlI ' /bin')
+  sed -i 's| /sbin| /usr/bin|;
+         ' $(grep -rlI ' /sbin')
+  sed -i 's|usr/sbin|usr/bin|;
+         ' $(grep -rlI usr/sbin)
+  #sed -i 's|/lib64|/lib|;
+  #       ' $(grep -rlI /lib64)
+  #sed -i 's|usr/libexec|usr/lib|;
+  #       ' $(grep -rlI usr/libexec)
+  sed -i 's|var/lock|run/lock|;
+         ' $(grep -rlI var/lock)
+  sed -i 's|var/run|run|;
+         ' $(grep -rlI var/run)
+
+  # remove Open Source term
+  sed -i 's|Open Source / ||;
+          s|open source / ||;
+          s|Open Source|Free|;
+          s|open source|free|;
+          s|Free Software Development Lab|Open Source Development Lab|;
+         ' $(grep -rilI 'open source')
+  #sed -i 's|OpenSource / ||;
+  #        s|opensource / ||;
+  #        s|OpenSource|Free|;
+  #        s|opensource|free|;
+  #        s|freesoftware.org|opensource.org|;
+  #        s|http://www.opensource.org/|http://www.gnu.org/philosophy/free-sw.html|;
+  #        s|http://www.gnu.org/philosophy/free-sw.htmllicenses/osl-|http://opensource.org/licenses/osl-|;
+  #        s|http://www.gnu.org/philosophy/free-sw.htmlosd|http://opensource.org/osd|;
+  #       ' $(grep -rilI opensource)
+
+  # remove Linux term
+  sed -i 's|Linux,|GNU/Linux,|;
+          s|Linux and|GNU/Linux and|;
+          s|Linux distro|GNU/Linux distro|;
+          s|Linux distribution|GNU/Linux distribution|;
+          s|Linux machine|GNU/Linux machine|;
+          s|Linux Only|GNU/Linux Only|;
+          s|Linux only|GNU/Linux only|;
+          s|Linux operating|GNU/Linux operating|;
+          s|Linux OS|GNU/Linux OS|;
+          s|Linux platform|GNU/Linux platform|;
+          s|Linux software|GNU/Linux software|;
+          s|Linux specific|GNU/Linux specific|;
+          s|Linux system|GNU/Linux system|;
+          s|Linux will|GNU/Linux will|;
+          s|# Linux$|# GNU/Linux|;
+          s|# Linux.$|# GNU/Linux.|;
+          s|* Linux$|* GNU/Linux|;
+          s|* Linux.$|* GNU/Linux.|;
+          s|// Linux$|// GNU/Linux|;
+          s|// Linux.$|// GNU/Linux.|;
+          s|, Linux|, GNU/Linux|;
+          s|As Linux|As GNU/Linux|;
+          s|as Linux|as GNU/Linux|;
+          s|And Linux|And GNU/Linux|;
+          s|and Linux|and GNU/Linux|;
+          s|Be Linux|Be GNU/Linux|;
+          s|be Linux|be GNU/Linux|;
+          s|Because Linux|Because GNU/Linux|;
+          s|because Linux|because GNU/Linux|;
+          s|e.g. Linux|e.g. GNU/Linux|;
+          s|For Linux|For GNU/Linux|;
+          s|for Linux|for GNU/Linux|;
+          s|In Linux|In GNU/Linux|;
+          s|in Linux|in GNU/Linux|;
+          s|Like Linux|Like GNU/Linux|;
+          s|like Linux|like GNU/Linux|;
+          s|non-Linux|non GNU/Linux|;
+          s|Of Linux|Of GNU/Linux|;
+          s|of Linux|of GNU/Linux|;
+          s|On Linux|On GNU/Linux|;
+          s|on Linux|on GNU/Linux|;
+          s|OS type: Linux|OS type: GNU/Linux|;
+          s|Other Linux|Other GNU/Linux|;
+          s|other Linux|other GNU/Linux|;
+          s|The Linux|The GNU/Linux|;
+          s|the Linux|the GNU/Linux|;
+          s|Typically Linux|Typically GNU/Linux|;
+          s|typically Linux|typically GNU/Linux|;
+          s|To Linux|To GNU/Linux|;
+          s|to Linux|to GNU/Linux|;
+          s|Under Linux|Under GNU/Linux|;
+          s|under Linux|under GNU/Linux|;
+          /Linux: "mail" offers "-s"./ s|Linux|GNU/Linux|;
+          s|ArchGNU/Linux|ArchLinux|;
+          s|e2fsprogs, typically GNU/Linux|e2fsprogs, typically Linux|;
+          s|GNU/GNU|GNU|;
+          s|GNU/Linux device|Linux device|;
+          s|GNU/Linux Director Daemon|Linux Director Daemon|;
+          s|GNU/Linux is a registered trademark of Linus Torvalds|Linux is a registered trademark of Linus Torvalds|;
+          s|GNU/Linux kernel|Linux kernel|;
+          s|GNU/Linux specific kernel|Linux specific kernel|;
+          s|GNU/Linux Standard Base|Linux Standard Base|;
+          s|GNU/Linux sysfs|Linux sysfs|;
+          s|GNU/Linux Virtual Server|Linux Virtual Server|;
+          s|GNU/Linux Watchdog|Linux Watchdog|;
+          s|GNU/Linux watchdog|Linux watchdog|;
+          s|GNU/LinuxHA|LinuxHA|;
+          s|GNU/Linux-HA|Linux-HA|;
+          s|GNU/LinuxSCSI|LinuxSCSI|;
+          s|HA GNU/Linux|HA Linux|;
+          s|High-Availability GNU/Linux|High-Availability Linux|;
+          s|MkGNU/Linux|MkLinux|;
+          s|SEGNU/Linux|SELinux|;
+          s|VA GNU/Linux Cluster|VA Linux Cluster|;
+          s|ConfigureLinux|ConfigureGNULinux|;
+         ' $(grep -rlI Linux)
+}
+
+build() {
+  cd $srcdir/${pkgname^}-3-0-STABLE-$pkgver
+  setarch $CARCH ./bootstrap
+  setarch $CARCH ./configure --prefix=/usr\
+    --disable-fatal-warnings\
+    --disable-static\
+    --enable-valgrind\
+    --libdir=/usr/lib\
+    --localstatedir=/var\
+    --sysconfdir=/etc\
+    --with-initdir=/etc/rc.d
+  setarch $CARCH make
+}
+
+package() {
+  cd $srcdir/${pkgname^}-3-0-STABLE-$pkgver
+  setarch $CARCH make DESTDIR=$pkgdir install
+
+  mv $pkgdir/{var/,}run
+  rm $pkgdir/etc/{ha.d/,}rc.d/* && rmdir $pkgdir/etc/{ha.d/,}rc.d
+
+  install -d $pkgdir/usr/lib/systemd/system
+  echo '[Unit]'                                                 >  $pkgdir/usr/lib/systemd/system/$pkgname.service
+  echo 'Description=Startup script high-availability services'  >> $pkgdir/usr/lib/systemd/system/$pkgname.service
+  echo 'Requires=network.target remote-fs.target timers.target' >> $pkgdir/usr/lib/systemd/system/$pkgname.service
+  echo ''                                                       >> $pkgdir/usr/lib/systemd/system/$pkgname.service
+  echo '[Service]'                                              >> $pkgdir/usr/lib/systemd/system/$pkgname.service
+  echo 'Type=forking'                                           >> $pkgdir/usr/lib/systemd/system/$pkgname.service
+  echo 'ExecStart=/usr/lib/heartbeat/heartbeat'                 >> $pkgdir/usr/lib/systemd/system/$pkgname.service
+  echo ''                                                       >> $pkgdir/usr/lib/systemd/system/$pkgname.service
+  echo '[Install]'                                              >> $pkgdir/usr/lib/systemd/system/$pkgname.service
+  echo 'WantedBy=multi-user.target'                             >> $pkgdir/usr/lib/systemd/system/$pkgname.service
+}
+
+# vim:set ts=2 sw=2 et:
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/jalv/PKGBUILD b/pcr/jalv/PKGBUILD
new file mode 100644
index 000000000..6100c5902
--- /dev/null
+++ b/pcr/jalv/PKGBUILD
@@ -0,0 +1,33 @@
+# Maintainer: Guest One <theguestone at gmail dot com>
+
+pkgname=jalv
+pkgver=1.4.0
+pkgrel=1
+pkgdesc="Run an LV2 plugin as a JACK application"
+arch=('i686')
+url="http://drobilla.net/software/$pkgname/"
+license=('custom:ISC')
+depends=('lilv' 'suil')
+makedepends=('python2' 'qt4' 'gtk2' 'gtk3' 'gtkmm')
+optdepends=('qt4: Qt 4.x frontend'
+            'gtk2: Gtk+ 2.x frontend'
+            'gtk3: Gtk+ 3.x frontend'
+            'gtkmm: Gtk++ 2.x frontend')
+source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2")
+md5sums=('23297b15cb541e0b3c5c05a2fdd9bcca')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  python2 waf configure --prefix=/usr
+  python2 waf
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  python2 waf install --destdir="$pkgdir"
+
+  # license
+  install -Dm644 COPYING \
+    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
diff --git a/pcr/jitsi/PKGBUILD b/pcr/jitsi/PKGBUILD
index 788d4f435..87913af64 100644
--- a/pcr/jitsi/PKGBUILD
+++ b/pcr/jitsi/PKGBUILD
@@ -1,34 +1,78 @@
 # Maintainer: Xavier Devlamynck <magicrhesus@ouranos.be>
 # Contributors: Keshav P R, atommix aka Aleks Lifey, Xavion, Ananda Samaddar, Dan Serban, Xyne
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
 
 pkgname=jitsi
-pkgver=2.0.4506.10553
-pkgrel=6
+pkgver=2.2.4603.9615
+pkgrel=2
 pkgdesc="An audio/video SIP VoIP phone and instant messenger written in Java (formerly SIP-Communicator)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://jitsi.org"
 license=('LGPL')
-depends=('java-runtime')
-makedepends=('apache-ant' 'java-environment')
+depends=('jre7-openjdk')
+makedepends=('apache-ant' 'jdk7-openjdk')
 options=(!strip !emptydirs zipman !libtool docs)
 source=("http://download.jitsi.org/jitsi/src/jitsi-src-${pkgver}.zip"
 		jitsi.desktop
-		jitsi.sh)
-sha256sums=('939adbda52b5aa19592bcd5edf5c77e1bcbbcaa4d0fcdb59c6b5c9e4a10b1e7d'
+		jitsi.sh
+		drop-open-term-on-index-jn-html.patch)
+sha256sums=('6ec46cc8f2306f5542c65fc637f70a7fe348b309ecc70a2483e05a745487ad41'
             '61e3bec3470790fa067f87d978016ec4452a6fd3dfba2c9afa5245b58d3cb19d'
-            '529722efc3bae6cb8923680363a4d778ccf78db9caf20bee90a110d34181d9f5')
+            '529722efc3bae6cb8923680363a4d778ccf78db9caf20bee90a110d34181d9f5'
+            'a862465431e9d272e00bb9aafe56edec0d5c4f3718062add53972685adb90631')
+
+prepare() {
+  cd $srcdir/$pkgname-src-$pkgver
 
-build()
-{
-  cd "${srcdir}/${pkgname}"
   # append the build revision to the jitsi version
-  sed -i "s/0\.build\.by\.SVN/build.${pkgver}/" src/net/java/sip/communicator/impl/version/NightlyBuildID.java
+  sed -i "s|0.build.by.SVN|build.$pkgver|" src/net/java/sip/communicator/impl/version/NightlyBuildID.java
+
+  # remove Open Source term
+  patch -Np0 -i ../drop-open-term-on-index-jn-html.patch
+  sed -i 's|Open Source / ||;
+          s|open source / ||;
+          s|Open Source|Free Software|;
+          s|open source|free software|;
+         ' $(grep -ril 'open source')
+  sed -i 's|OpenSource / ||;
+          s|opensource / ||;
+          s|OpenSource|FreeSoftware|;
+          s|opensource|freesoftware|;
+         ' $(grep -ril opensource)
+
+  # remove Linux term
+  sed -i '/, Linux/ s|Linux|GNU/Linux|;
+          /And Linux/ s|Linux|GNU/Linux|;
+          /and Linux/ s|Linux|GNU/Linux|;
+          /For Linux/ s|Linux|GNU/Linux|;
+          /for Linux/ s|Linux|GNU/Linux|;
+          /Linux,/ s|Linux|GNU/Linux|;
+          /Linux and/ s|Linux|GNU/Linux|;
+          /Linux distribution/ s|Linux|GNU/Linux|;
+          /Linux machine/ s|Linux|GNU/Linux|;
+          /Linux operating/ s|Linux|GNU/Linux|;
+          /Linux OS/ s|Linux|GNU/Linux|;
+          /Linux specific/ s|Linux|GNU/Linux|;
+          /Linux system/ s|Linux|GNU/Linux|;
+          /Under Linux/ s|Linux|GNU/Linux|;
+          /under Linux/ s|Linux|GNU/Linux|;
+          /On Linux/ s|Linux|GNU/Linux|;
+          /on Linux/ s|Linux|GNU/Linux|;
+          s|GNU/GNU|GNU|;
+          s|GNU/Linux kernel|Linux kernel|;
+          s|GNU/Linux specific kernel|Linux specific kernel|;
+         ' $(grep -rl Linux)
+}
+
+build() {
+  cd $srcdir/$pkgname-src-$pkgver
   . /etc/profile.d/apache-ant.sh
   ant rebuild
 }
 
 package() {
-  cd "${srcdir}/${pkgname}"
+  cd $srcdir/$pkgname-src-$pkgver
   find lib/ lib/bundle/ -maxdepth 1 -type f \
     -exec install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/"{} \;
   find lib/os-specific/linux/ -maxdepth 1 -type f \
diff --git a/pcr/jitsi/drop-open-term-on-index-jn-html.patch b/pcr/jitsi/drop-open-term-on-index-jn-html.patch
new file mode 100644
index 000000000..8d4012a05
--- /dev/null
+++ b/pcr/jitsi/drop-open-term-on-index-jn-html.patch
@@ -0,0 +1,6 @@
+--- www/index-jn.html	2011-01-29 08:36:48.000000000 -0200
++++ www/index-jn.html-new	2013-05-29 01:05:48.942716248 -0300
+@@ -1,2 +1,2 @@
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+-<meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />                                <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />  <table width="100%" cellpadding="0" bordercolor="#111111" border="0" style="border-collapse: collapse" id="AutoNumber2">   <tbody><tr>     <td valign="middle" style="width: 20%">     <p align="center"> 	<a href="http://sip-communicator.org"><img border="0" alt="sip-communicator.org" src="images/sip-communicator.logo.png" /></a><br />             SIP Communicator <br />Open Source  VoIP &amp; IM     </p> <br />     </td>     <td style="width: 90%">          <p align="justify">     SIP Communicator is an audio/video Internet phone and instant messenger that     support some of the most popular instant messaging and telephony protocols     such as SIP, Jabber, AIM/ICQ, MSN and soon others like Yahoo and IRC.     </p>     <p align="justify">     SIP Communicator is completely <a href="http://www.opensource.org/">Open Source</a> /     <a href="http://www.gnu.org/philosophy/free-sw.html">Free Software</a>, and is     freely available under the terms of the     <a href="http://www.gnu.org/licenses/lgpl.html">GNU Lesser General Public License</a>.     </p>      <table width="100%" cellspacing="2" cellpadding="2" border="0" style="background-color: white">     <tbody><tr><td style="background-color: lightgray">       <p>         RESOURCES: The SIP Communicator <a class="wikilink" href="http://www.sip-communicator.org/index.php/Documentation/FAQ">FAQ</a>           can usually answer most questions. You can also ask on the           <a class="wikilink" href="http://www.sip-communicator.org/index.php/Development/MailingLists#users">users</a>             mailing list, or at the <a class="urllink" rel="nofollow" href="http://www.sip-communicator.org/irc/irc.cgi">irc channel</a>               #sip-communicator at irc.freenode.net.       </p>       </td></tr>     </tbody></table>     <p><em>         <strong>Note:</strong> Right now SIP Communicator is still a work in         progress and as such is still unstable. If you would like to help or         follow project progress check the <a class="wikilink" href="http://www.sip-communicator.org/index.php/Development/Roadmap">Project Roadmap</a>           or join our <a class="wikilink" href="http://www.sip-communicator.org/index.php/Development/MailingLists">Mailing Lists</a>.           You can also have a look at the SIP Communicator <a class="wikilink" href="http://www.sip-communicator.org/index.php/Main/Screenshots">screenshots</a> </em>      </p>      <p> <strong> Thanks for your patience and continuing support! <br /> <a href="https://sip-communicator.org/wiki/index.php/Development/TeamAndContributors"> The SIP Communicator team</a></strong></p>       </td>   </tr> </tbody></table>                                                                     
++<meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />                                <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />  <table width="100%" cellpadding="0" bordercolor="#111111" border="0" style="border-collapse: collapse" id="AutoNumber2">   <tbody><tr>     <td valign="middle" style="width: 20%">     <p align="center"> 	<a href="http://sip-communicator.org"><img border="0" alt="sip-communicator.org" src="images/sip-communicator.logo.png" /></a><br />             SIP Communicator <br />Free Software  VoIP &amp; IM     </p> <br />     </td>     <td style="width: 90%">          <p align="justify">     SIP Communicator is an audio/video Internet phone and instant messenger that     support some of the most popular instant messaging and telephony protocols     such as SIP, Jabber, AIM/ICQ, MSN and soon others like Yahoo and IRC.     </p>     <p align="justify">     SIP Communicator is completely <a href="http://www.gnu.org/philosophy/free-sw.html">Free Software</a>, and is     freely available under the terms of the     <a href="http://www.gnu.org/licenses/lgpl.html">GNU Lesser General Public License</a>.     </p>      <table width="100%" cellspacing="2" cellpadding="2" border="0" style="background-color: white">     <tbody><tr><td style="background-color: lightgray">       <p>         RESOURCES: The SIP Communicator <a class="wikilink" href="http://www.sip-communicator.org/index.php/Documentation/FAQ">FAQ</a>           can usually answer most questions. You can also ask on the           <a class="wikilink" href="http://www.sip-communicator.org/index.php/Development/MailingLists#users">users</a>             mailing list, or at the <a class="urllink" rel="nofollow" href="http://www.sip-communicator.org/irc/irc.cgi">irc channel</a>               #sip-communicator at irc.freenode.net.       </p>       </td></tr>     </tbody></table>     <p><em>         <strong>Note:</strong> Right now SIP Communicator is still a work in         progress and as such is still unstable. If you would like to help or         follow project progress check the <a class="wikilink" href="http://www.sip-communicator.org/index.php/Development/Roadmap">Project Roadmap</a>           or join our <a class="wikilink" href="http://www.sip-communicator.org/index.php/Development/MailingLists">Mailing Lists</a>.           You can also have a look at the SIP Communicator <a class="wikilink" href="http://www.sip-communicator.org/index.php/Main/Screenshots">screenshots</a> </em>      </p>      <p> <strong> Thanks for your patience and continuing support! <br /> <a href="https://sip-communicator.org/wiki/index.php/Development/TeamAndContributors"> The SIP Communicator team</a></strong></p>       </td>   </tr> </tbody></table>                                                                     
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/lcmc/PKGBUILD b/pcr/lcmc/PKGBUILD
index 538949f60..6b27ff5f4 100644
--- a/pcr/lcmc/PKGBUILD
+++ b/pcr/lcmc/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
 
 pkgname=lcmc
 pkgver=1.5.1
diff --git a/pcr/libav-builder/PKGBUILD b/pcr/libav-builder/PKGBUILD
deleted file mode 100644
index 5f7168f86..000000000
--- a/pcr/libav-builder/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-
-static=false
-pkgbase=libav
-if [[ $static == true ]] || [[ $static == 1 ]] || [[ $static == enable ]]; then
-  pkgname=libav-static-builder
-elif [[ $static == false ]] || [[ $static == 0 ]] || [[ $static == disable ]]; then
-  pkgname=libav-builder
-fi
-pkgflag=builder
-pkgver=9.3
-pkgrel=1
-pkgdesc="Link files on /usr/include and /usr/lib dir (ONLY FOR BUILD OTHERS PACKAGES)"
-arch=any
-url="http://$pkgbase.org/"
-license=GPL
-depends=${pkgname%-$pkgflag}=$pkgver
-conflicts=(
-  ffmpeg
-  ffmpeg-static
-)
-if [[ $static == true ]] || [[ $static == 1 ]] || [[ $static == enable ]]; then
-  conflicts+=(
-    ${pkgname%-static-$pkgflag}
-  )
-elif [[ $static == false ]] || [[ $static == 0 ]] || [[ $static == disable ]]; then
-  conflicts+=(
-    ${pkgname%-$pkgflag}-static
-  )
-fi
-
-package() {
-  install -m755 -d $pkgdir/usr/{include,lib{,/pkgconfig}}
-  include_list=$(ls /opt/${pkgname%-$pkgflag}/include)
-  for i in $include_list; do
-    ln -s /opt/${pkgname%-$pkgflag}/include/$i $pkgdir/usr/include
-  done
-  lib_list=$(ls /opt/${pkgname%-$pkgflag}/lib | grep lib)
-  for l in $lib_list; do
-    ln -s /opt/${pkgname%-$pkgflag}/lib/$l $pkgdir/usr/lib
-  done
-  pkgconfig_list=$(ls /opt/${pkgname%-$pkgflag}/lib/pkgconfig)
-  for c in $pkgconfig_list; do
-    ln -s /opt/${pkgname%-$pkgflag}/lib/pkgconfig/$c $pkgdir/usr/lib/pkgconfig
-  done
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/libav/PKGBUILD b/pcr/libav/PKGBUILD
index 05dd756c0..782e12a15 100644
--- a/pcr/libav/PKGBUILD
+++ b/pcr/libav/PKGBUILD
@@ -1,11 +1,7 @@
-# $Id$
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Contributor: Paul Mattal <paul@archlinux.org>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
 
 static=false
-pkgbase=libav
+_pkgname=libav
 if [[ $static == true ]] || [[ $static == 1 ]] || [[ $static == enable ]]; then
   pkgname=libav-static
   pkgflag=-static
@@ -13,7 +9,7 @@ if [[ $static == true ]] || [[ $static == 1 ]] || [[ $static == enable ]]; then
 elif [[ $static == false ]] || [[ $static == 0 ]] || [[ $static == disable ]]; then
   pkgname=libav
 fi
-pkgver=9.3
+pkgver=9.7
 pkgrel=1
 pkgdesc="Complete and free Internet live audio and video broadcasting solution for GNU/Linux$staticdesc"
 arch=(
@@ -21,10 +17,8 @@ arch=(
   x86_64
   mips64el
 )
-url="http://$pkgbase.org/"
-license=(
-  GPL
-)
+url=http://$_pkgname.org/
+license=GPL3
 depends=(
   alsa-lib
   bzip2
@@ -37,7 +31,8 @@ depends=(
   libvorbis
   libvpx
   opencore-amr
-  openjpeg
+  #openjpeg
+  opus
   rtmpdump
   schroedinger
   sdl
@@ -50,30 +45,29 @@ makedepends=(
   yasm
   libvdpau
 )
-source=(
-  http://$pkgbase.org/releases/$pkgbase-$pkgver.tar.gz
-)
-sha512sums=(
-  de3aaa571fed67d22ec2a0c53599af56684afa38445cf67fd09d26c23eeded5a184d045f472d414815d17783b421f937fd3d9565637e20f2050aaaf0081164fe
-)
+source=http://$_pkgname.org/releases/$_pkgname-$pkgver.tar.gz
+sha512sums=6a446e8dceb9ee4f1fb7a7d68d254086990bbcab5b1014598b21c75e0add22dab47c30a95bc3129835cc40a8d32de9c61fb267b2fa2aa9353dbbfc4b716767e4
 
 build() {
-  cd $pkgbase-$pkgver
+  cd $_pkgname-$pkgver
 
   [[ $static == false ]] && sttcv=disable || sttcv=enable
 
-  ./configure\
+  setarch $CARCH ./configure\
     --prefix=/opt/$pkgname\
     --disable-debug\
     --$sttcv-static\
     --enable-avresample\
+    --enable-avserver\
+    --enable-dxva2\
     --enable-gpl\
     --enable-libfreetype\
     --enable-libgsm\
     --enable-libmp3lame\
     --enable-libopencore_amrnb\
     --enable-libopencore_amrwb\
-    --enable-libopenjpeg\
+    --disable-libopenjpeg\
+    --enable-libopus\
     --enable-libpulse\
     --enable-librtmp\
     --enable-libschroedinger\
@@ -87,14 +81,13 @@ build() {
     --enable-shared\
     --enable-version3\
     --enable-x11grab
-
   setarch $CARCH make
   setarch $CARCH make tools/qt-faststart
   setarch $CARCH make doc/av{conv,play,server}.1
 }
 
 package() {
-  cd $pkgbase-$pkgver
+  cd $_pkgname-$pkgver
   setarch $CARCH make DESTDIR=$pkgdir install install-man
   install -m755 -d                              $pkgdir/etc/ld.so.conf.d
   install -m755 -d                              $pkgdir/usr/bin
@@ -103,10 +96,12 @@ package() {
   ln -s /opt/$pkgname/bin/avconv                $pkgdir/usr/bin/avconv$pkgflag
   ln -s /opt/$pkgname/bin/avplay                $pkgdir/usr/bin/avplay$pkgflag
   ln -s /opt/$pkgname/bin/avprobe               $pkgdir/usr/bin/avprobe$pkgflag
+  ln -s /opt/$pkgname/bin/avserver              $pkgdir/usr/bin/avserver$pkgflag
   ln -s /opt/$pkgname/bin/qt-faststart          $pkgdir/usr/bin/qt-faststart-$pkgname
   ln -s /opt/$pkgname/share/man/man1/avconv.1   $pkgdir/usr/share/man/man1/avconv$pkgflag.1
   ln -s /opt/$pkgname/share/man/man1/avplay.1   $pkgdir/usr/share/man/man1/avplay$pkgflag.1
   ln -s /opt/$pkgname/share/man/man1/avprobe.1  $pkgdir/usr/share/man/man1/avprobe$pkgflag.1
+  ln -s /opt/$pkgname/share/man/man1/avserver.1 $pkgdir/usr/share/man/man1/avserver$pkgflag.1
   echo /opt/libav$pkgflag/lib                 > $pkgdir/etc/ld.so.conf.d/libav$pkgflag.conf
 }
 
diff --git a/pcr/libqb/PKGBUILD b/pcr/libqb/PKGBUILD
index eacdb6ea2..85b3ff082 100644
--- a/pcr/libqb/PKGBUILD
+++ b/pcr/libqb/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=libqb
 pkgver=0.14.4
-pkgrel=1
+pkgrel=3
 pkgdesc='Library with the primary purpose of providing high performance client server reusable features'
 arch=(
   i686
@@ -14,6 +14,7 @@ makedepends=(
   splint
 )
 license=LGPL2.1
+options=(!libtool)
 url=https://github.com/asalkeld/$pkgname/wiki
 source=https://github.com/asalkeld/$pkgname/archive/v$pkgver.tar.gz
 sha512sums=1377e38d5547eb516b255c0aa0972e858048053202692d7d5ef1c746d79dee2c78eddc29e797215376990f2c776b34261f765858606b59d77f9218fb0dac5977
@@ -22,7 +23,10 @@ build() {
   cd $srcdir/$pkgname-$pkgver
   setarch $CARCH ./autogen.sh
   setarch $CARCH ./configure --prefix=/usr\
-    --libdir=/usr/lib
+    --disable-fatal-warnings\
+    --disable-static\
+    --libdir=/usr/lib\
+    --sbindir=/usr/bin
   setarch $CARCH make
 }
 
diff --git a/pcr/lilo/PKGBUILD b/pcr/lilo/PKGBUILD
new file mode 100644
index 000000000..10d334b05
--- /dev/null
+++ b/pcr/lilo/PKGBUILD
@@ -0,0 +1,47 @@
+# Maintainer: Connor Behan <connor.behan@gmail.com>
+# Contributor: Eric Belanger <eric@archlinux.org>
+# Contributor: judd <jvinet@zeroflux.org>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+pkgname=lilo
+pkgver=24.0
+pkgrel=1
+pkgdesc="A bootloader for GNU/Linux (Parabola rebranded)"
+arch=('i686' 'x86_64')
+url="https://alioth.debian.org/projects/lilo/"
+license=('BSD')
+backup=('etc/lilo.conf')
+depends=('device-mapper' 'coreutils')
+makedepends=('bin86' 'sharutils')
+optdepends=('perl: to use keytab-lilo')
+install=lilo.install
+options=('!makeflags')
+source=("http://lilo.alioth.debian.org/ftp/sources/${pkgname}-${pkgver}.tar.gz"
+        'lilo.conf')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  export LC_ALL=C
+
+  sed -i -e 's/strip lilo.static/strip lilo.static || true/' src/Makefile
+  make all
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  install -D -m644 "${srcdir}"/lilo.conf "${pkgdir}"/etc/lilo.conf
+  install -D -m644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+
+  # All binaries in /usr/bin
+  mkdir "${pkgdir}"/usr/bin
+  mv "${pkgdir}"/sbin/lilo "${pkgdir}"/usr/bin/
+  mv "${pkgdir}"/usr/sbin/* "${pkgdir}"/usr/bin/
+  rm -rf "${pkgdir}"/sbin
+  rm -rf "${pkgdir}"/usr/sbin
+
+  # Avoid conflict with syslinux
+  mv "${pkgdir}"/usr/bin/keytab-lilo "${pkgdir}"/usr/bin/keytab-lilo.pl
+}
+md5sums=('03d7090835a5675314082847f1ac7910' 'd06b3c4655577ed01fea79ec5743b4b0')
diff --git a/pcr/lilo/lilo.conf b/pcr/lilo/lilo.conf
new file mode 100644
index 000000000..479390df5
--- /dev/null
+++ b/pcr/lilo/lilo.conf
@@ -0,0 +1,25 @@
+#
+# /etc/lilo.conf
+#
+
+boot=/dev/sda
+# This line often fixes L40 errors on bootup
+# disk=/dev/sda bios=0x80
+
+default=parabola
+timeout=50
+lba32
+prompt
+
+image=/boot/vmlinuz-linux-libre
+	label=parabola
+	root=/dev/sda3
+	initrd=/boot/initramfs-linux-libre.img
+	read-only
+
+image=/boot/vmlinuz-linux-libre
+	label=parabola-fallback
+	root=/dev/sda3
+	initrd=/boot/initramfs-linux-libre-fallback.img
+	read-only
+
diff --git a/pcr/lilo/lilo.install b/pcr/lilo/lilo.install
new file mode 100644
index 000000000..7375fddf8
--- /dev/null
+++ b/pcr/lilo/lilo.install
@@ -0,0 +1,5 @@
+post_upgrade() {
+  echo
+  echo "If you use the LILO bootloader, you should run 'lilo' after upgrading."
+  echo
+}
diff --git a/pcr/lua51-sql-mysql/PKGBUILD b/pcr/lua51-sql-mysql/PKGBUILD
new file mode 100644
index 000000000..04ffee934
--- /dev/null
+++ b/pcr/lua51-sql-mysql/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Sébastien Luttringer <seblu@archlinux.org>
+# Contributor: Anders Bergh <anders1@gmail.com>
+
+pkgname=lua51-sql-mysql
+pkgdesc='MySQL module for Lua 5.1'
+pkgver=2.2.0
+pkgrel=3
+arch=('i686' 'x86_64')
+url='http://www.keplerproject.org/luasql/'
+license=('MIT')
+depends=('lua51' 'libmariadbclient')
+source=("https://github.com/downloads/keplerproject/luasql/luasql-$pkgver.tar.gz")
+md5sums=('59d72db444c6369c936d4f03694db6b7')
+
+build() {
+  cd luasql-$pkgver
+  sed -i '24s,$,/lua5.1,' config
+  msg2 'Building MySQL support'
+  make T=mysql PREFIX=/usr DRIVER_LIBS="$(mysql_config --libs)" \
+    DRIVER_INCS="$(mysql_config --include) -fPIC"
+}
+
+package() {
+  cd luasql-$pkgver
+  install -Dm644 src/mysql.so "$pkgdir/usr/lib/lua/5.1/luasql/mysql.so"
+  install -Dm644 doc/us/license.html "$pkgdir/usr/share/licenses/$pkgname/license.html"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/lv2-ir/PKGBUILD b/pcr/lv2-ir/PKGBUILD
new file mode 100644
index 000000000..cdeaf7414
--- /dev/null
+++ b/pcr/lv2-ir/PKGBUILD
@@ -0,0 +1,33 @@
+# Maintainer: Guest One <theguestone at gmail dot com>
+
+pkgname=lv2-ir
+pkgver=1.3.2
+pkgrel=1
+pkgdesc="zero-latency, realtime, high performance signal convolver especially for creating reverb effects."
+arch=('i686' 'x86_64')
+url="http://factorial.hu/plugins/lv2/ir"
+license=('GPL')
+depends=('zita-convolver' 'libsamplerate' 'gtk2')
+provides=('ir-lv2')
+conflicts=('ir-lv2')
+groups=('lv2-plugins')
+makedepends=('lv2core' )
+
+source=("http://factorial.hu/system/files/ir.lv2-${pkgver}.tar.gz")
+md5sums=('01140e1f70e7f4949f502eafc1958bcd')
+
+build() {
+  cd "$srcdir/ir.lv2-${pkgver}"
+  make
+  make convert4chan
+}
+
+package() {
+  cd "$srcdir/ir.lv2-${pkgver}"
+  make PREFIX="$pkgdir/usr" install
+  install -Dm755 convert4chan "$pkgdir/usr/bin/convert4chan"
+  # fixed location
+  sed -i 's/, but seem like its gone://' README
+  sed -i  's@rhythminmind.net/1313@rhythminmind.net/STN@' README
+  install -Dm644 README "${pkgdir}"/usr/share/doc/$pkgname/README
+}
diff --git a/pcr/maliit-framework/PKGBUILD b/pcr/maliit-framework/PKGBUILD
new file mode 100644
index 000000000..545c34a0c
--- /dev/null
+++ b/pcr/maliit-framework/PKGBUILD
@@ -0,0 +1,33 @@
+# Contributor: Jon Nordby <jononor@gmail.com>
+# Maintainer: Jon Nordby <jononor@gmail.com>
+# Maintainer (Parabola): Javier Barcena <javierbuilder@gmail.com>
+# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+
+pkgname=maliit-framework
+pkgver=0.99.0
+pkgrel=6
+pkgdesc="Maliit Input Methods - Framework"
+arch=('x86_64' 'i686')
+url="http://maliit.org"
+license=('LGPL')
+depends=('qt5-base' 'qt5-quick1' 'gtk2' 'gtk3' 'gconf')
+install=$pkgname.install
+source=(http://maliit.org/releases/$pkgname/$pkgname-$pkgver.tar.bz2)
+md5sums=('c5e8c67cbfb514122518d92f1edcc990')
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  # BUILD
+  qmake -r .
+  make
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+  make INSTALL_ROOT="$pkgdir" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install
+
+  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
+  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain maliit-framework "$pkgdir"/etc/gconf/schemas/*.schemas
+  rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
+} 
diff --git a/pcr/maliit-framework/maliit-framework.install b/pcr/maliit-framework/maliit-framework.install
new file mode 100755
index 000000000..08c54ae1b
--- /dev/null
+++ b/pcr/maliit-framework/maliit-framework.install
@@ -0,0 +1,30 @@
+pkgname=maliit-framework
+
+post_install() {
+  echo "Updating gtk.immodules..."
+  gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+  gtk-query-immodules-3.0 --update-cache
+  echo "Done."
+
+  gconfpkg --install ${pkgname}
+}
+
+pre_upgrade() {
+  pre_remove $1
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  gconfpkg --uninstall ${pkgname}
+}
+
+post_remove() {
+  echo "Updating gtk.immodules..."
+  gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+  gtk-query-immodules-3.0 --update-cache
+  echo "Done."
+
+}
diff --git a/pcr/maliit-plugins/PKGBUILD b/pcr/maliit-plugins/PKGBUILD
new file mode 100644
index 000000000..cdab07003
--- /dev/null
+++ b/pcr/maliit-plugins/PKGBUILD
@@ -0,0 +1,32 @@
+# Contributor: Jon Nordby <jononor@gmail.com>
+# Maintainer: Jon Nordby <jononor@gmail.com>
+
+pkgname=maliit-plugins
+pkgver=0.99.0
+pkgrel=1
+pkgdesc="Maliit Input Methods - Plugins"
+arch=('x86_64' 'i686')
+url="http://maliit.org"
+license=('LGPL')
+depends=('qt5-base' 'maliit-framework')
+source=(http://maliit.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+        config.patch)
+md5sums=('29f07d937803a61e74301e4616d55dbb'
+         'f43d45c9917924750edf36000492bd73')
+
+build() {
+  cd "$srcdir/${pkgname}-${pkgver}"
+
+  # fix issue on building
+  patch -Np1 -i "$srcdir/config.patch"
+
+  # BUILD
+  qmake -r . CONFIG+=notests
+  make
+}
+
+package() {
+  cd "$srcdir/${pkgname}-${pkgver}"
+
+  make install INSTALL_ROOT="$pkgdir/"
+} 
diff --git a/pcr/mda-lv2/PKGBUILD b/pcr/mda-lv2/PKGBUILD
new file mode 100644
index 000000000..500a656a5
--- /dev/null
+++ b/pcr/mda-lv2/PKGBUILD
@@ -0,0 +1,26 @@
+# Maintainer: Guest One <theguestone at gmail dot com>
+
+pkgname=mda-lv2
+pkgver=1.0.0
+pkgrel=1
+pkgdesc="An LV2 port of the MDA plugins by Paul Kellett"
+arch=('i686')
+url="http://drobilla.net/2012/04/21/mda-lv2-1-0-0/"
+license=('GPL3')
+depends=('lv2')
+makedepends=('python2')
+source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2")
+md5sums=('843ac4eade386034562917e95905e5d8')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  python2 ./waf configure --prefix=/usr
+  python2 ./waf
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  DESTDIR="$pkgdir" python2 ./waf install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/mednafen-server/PKGBUILD b/pcr/mednafen-server/PKGBUILD
index 0c7057908..9968dde38 100644
--- a/pcr/mednafen-server/PKGBUILD
+++ b/pcr/mednafen-server/PKGBUILD
@@ -1,26 +1,24 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
 
 pkgname=mednafen-server
+_pkgname=${pkgname%-server}
 pkgver=0.5.0
-pkgrel=1
+pkgrel=2
 pkgdesc='A server multi-system gaming emulator'
-url=http://${pkgname%-server}.sourceforge.net/
-license=(
-  GPL
-)
+url=http://$_pkgname.sourceforge.net/
+license=GPL2
 arch=(
   i686
   x86_64
   mips64el
 )
+backup=etc/$pkgname/standard.conf
 source=(
-  http://downloads.sourceforge.net/project/${pkgname%-server}/Mednafen-Server/$pkgver/$pkgname-$pkgver.tar.gz
-  ${pkgname}d
+  http://downloads.sourceforge.net/project/$_pkgname/${_pkgname^}-Server/$pkgver/$pkgname-$pkgver.tar.gz
   $pkgname.service
 )
 sha512sums=(
   700b2021e5085761b90bb5ee802ff9ccded3cdade76682fe9faa98ebbb0653c9b00baea5baa1c486f850bad606aae33a88e4d9486015babb210648aa0cd4542d
-  55cba761db9c10978a5146e4f92ccce2a645e0566d0744e745b36ede56a0332d1cb1f6c8a09df6a1c01320b539f07ccd7073b2d85eca6b340449a1c3b9761407
   cd3d19b789ec7f62c4b8f5fe0f93e7836fab5406a3416434701caf6404cce02c7223dcb8b82bd1e4b00bdcf4df623f0cd44f850a7f79a7be73e04c0804972700
 )
 
@@ -34,6 +32,5 @@ package() {
   cd $srcdir/$pkgname
   make DESTDIR=$pkgdir install
   install -Dm644 standard.conf            $pkgdir/etc/$pkgname/standard.conf
-  install -Dm644 $srcdir/${pkgname}d      $pkgdir/etc/rc.d/$pkgname
   install -Dm644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service
 }
diff --git a/pcr/miniupnpd/PKGBUILD b/pcr/miniupnpd/PKGBUILD
index 578da839e..da6f373c9 100644
--- a/pcr/miniupnpd/PKGBUILD
+++ b/pcr/miniupnpd/PKGBUILD
@@ -1,20 +1,19 @@
 # $Id$
-# Maintainer: None
+# Maintainer: fauno <fauno@parabola.nu>
 pkgname=miniupnpd
 pkgver=1.8.20130503
-pkgrel=1
+pkgrel=3
 pkgdesc="Lightweight UPnP IGD daemon"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://miniupnp.free.fr"
 license=('BSD')
 backup=(etc/miniupnpd/miniupnpd.conf)
-depends=('libnfnetlink' 'iptables>=1.4.3')
+depends=('libnfnetlink' 'iptables>=1.4.3' 'net-tools')
 makedepends=('lsb-release')
 source=("http://miniupnp.free.fr/files/$pkgname-$pkgver.tar.gz"
         miniupnpd.systemd)
 md5sums=('484dbda7c428b2d5f3768500a48d3375'
-         'f862f79b673359adc80faf0be914394f'
-         '2cc73f661cacb2fa374eee3d1030f428')
+         '0c3f1777b6c043dd5029092d62896660')
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
@@ -34,10 +33,13 @@ package() {
 	install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 	install -Dm644 "${srcdir}/miniupnpd.systemd" "${pkgdir}/usr/lib/systemd/system/miniupnpd.service"
 
-	sed -i 's:/sbin/iptables:/usr/sbin/iptables:
+	sed -i 's:/s\?bin/iptables:/usr/bin/iptables:
 	        s:eth0:"`cat /etc/miniupnpd/miniupnpd.conf | '"awk -F= '/^ext_ifname/ { print \$2 }'"'`":' "${pkgdir}"/etc/miniupnpd/*.sh
 	sed -i -e "s/^uuid=[-0-9a-f]*/uuid=00000000-0000-0000-0000-000000000000/
 	           s/make genuuid/uuidgen/" "${pkgdir}/etc/miniupnpd/miniupnpd.conf"
+        # usrmove
+        cd "$pkgdir"
+        mv usr/sbin usr/bin
 }
 md5sums=('484dbda7c428b2d5f3768500a48d3375'
          'f862f79b673359adc80faf0be914394f')
diff --git a/pcr/miniupnpd/miniupnpd.systemd b/pcr/miniupnpd/miniupnpd.systemd
index 4c5aa77cc..88973535c 100644
--- a/pcr/miniupnpd/miniupnpd.systemd
+++ b/pcr/miniupnpd/miniupnpd.systemd
@@ -3,9 +3,9 @@ Description=Lightweight UPnP IGD daemon
 
 [Service]
 ExecStartPre=/etc/miniupnpd/iptables_init.sh
-ExecStart=/usr/sbin/miniupnpd -f /etc/miniupnpd/miniupnpd.conf -d
+ExecStart=/usr/bin/miniupnpd -f /etc/miniupnpd/miniupnpd.conf -d
 ExecStopPost=/etc/miniupnpd/iptables_removeall.sh
-PIDFile=/var/run/miniupnpd.pid
+PIDFile=/run/miniupnpd.pid
 StandardOutput=null
 
 [Install]
diff --git a/pcr/mitsuba/PKGBUILD b/pcr/mitsuba/PKGBUILD
index 219da84fc..f2d7f83b0 100644
--- a/pcr/mitsuba/PKGBUILD
+++ b/pcr/mitsuba/PKGBUILD
@@ -4,32 +4,31 @@ pkgname=(
   mitsuba
   blender-addon-mitsuba
 )
+_pkgname=${pkgname[0]}
 _bldname=${pkgname[1]::7}
-_addname=${pkgname[0]}-${_bldname}
-pkgver=0.4.4 # Thu Feb 28 15:00:37 2013 -0800 tag:v0.4.4 rev:1674
-_pkgdat=20130228
-_pkgrev=1674
-_bldver=2.66
+_addname=$_pkgname-$_bldname
+pkgver=0.4.4
+_bldver=2.67
 _addver=0.2.1 # Wed Mar 20 01:30:37 2013 +0100 rev:40 ($srcdir/$_addname/${pkgname[0]}/__init__.py:bl_info>version)
 _adddat=20130320
 _addrev=40
-_bldep=7
+_bldep=8
 _pyver=3.3
-pkgrel=1
+pkgrel=3
 pkgdesc='A physically based renderer'
 arch=(
   i686
   x86_64
   mips64el
 )
-url=https://${pkgname[0]}-renderer.org/
+url=https://www.$_pkgname-renderer.org/
 license=GPL3
 depends=(
   boost-libs
   collada-dom
   glew
   libxxf86vm
-  'openexr=2.0.0'
+  openexr
   qt4
   xerces-c
 )
@@ -44,28 +43,25 @@ makedepends=(
   mercurial
   python
 )
-install=$pkgname.install
+install=$_pkgname.install
 source=(
-  hg+https://${pkgname[0]}-renderer.org/hg/${pkgname[0]}
-  hg+https://${pkgname[0]}-renderer.org/hg/$_addname
+  ${url}hg/$_pkgname/archive/v$pkgver.tar.bz2
+  hg+${url}hg/$_addname
   ${pkgname[1]}.install
 )
-sha512sums=(SKIP SKIP SKIP)
+sha512sums=(
+  66dcab376a44eeb2fbe808a32ead5b554d777fb2f6a73c43883086b7829e0c697aaeccbb6fbbed9fcb221684a64ccce8be81a78ebcd228316ea12b8f6f3e7f6c
+  SKIP SKIP
+)
 
 prepare() {
   mv $srcdir/${pkgname[1]}.install $startdir
 
-  cd $srcdir/${pkgname[0]}
+  cd $srcdir/$_pkgname-v$pkgver
 
   [[ -d build ]] && rm -r build
   mkdir build
 
-  cd $startdir/../srcdest/${pkgname[0]}
-
-  msg "${pkgname[0]}"
-  hg update -c v$pkgver
-  hg log -l 1 -r v$pkgver
-
   cd $startdir/../srcdest/$_addname
 
   msg "${pkgname[1]}"
@@ -74,7 +70,7 @@ prepare() {
 }
 
 build() {
-  cd $srcdir/${pkgname[0]}/build
+  cd $srcdir/$_pkgname-v$pkgver/build
 
   [[ $CARCH != x86_64 ]] && DMTS_SSE='-DMTS_SSE=OFF'
 
@@ -83,24 +79,23 @@ build() {
     -DBoost_PYTHON_LIBRARY=/usr/lib/libboost_python${_pyver::1}.so\
     -DPYTHON_INCLUDE_DIR=/usr/include/python${_pyver}m\
     -DPYTHON_LIBRARY=/usr/lib/libpython${_pyver}m.so
-
   setarch $CARCH make
 }
 
 package_mitsuba() {
-  cd $srcdir/${pkgname[0]}/build
+  cd $srcdir/$_pkgname-v$pkgver/build
   setarch $CARCH make DESTDIR=$pkgdir install
 
   #fixing files and folders location
   a=$pkgdir/usr
-  b=$srcdir/${pkgname[0]}
-  install -d $a/{bin,lib{,/python$_pyver/lib-dynload},share/{applications,{licenses/,}${pkgname[0]},pixmaps}}
-  install -m644 $b/data/linux/${pkgname[0]}.desktop         $a/share/applications
-  install -m644 $b/src/mtsgui/resources/${pkgname[0]}48.png $a/share/pixmaps
-  install -m644 $b/doc/license.txt                          $a/share/licenses/${pkgname[0]}/LICENSE
+  b=$srcdir/$_pkgname-v$pkgver
+  install -d $a/{bin,lib{,/python$_pyver/lib-dynload},share/{applications,{licenses/,}$_pkgname,pixmaps}}
+  install -m644 $b/data/linux/$_pkgname.desktop           $a/share/applications
+  install -m644 $b/src/mtsgui/resources/${_pkgname}48.png $a/share/pixmaps
+  install -m644 $b/doc/license.txt                        $a/share/licenses/$_pkgname/LICENSE
   mv $a/{m{itsuba,ts{gui,import,srv,util}},bin}
   mv $a/lib{${pkgname[0]}-{bidir,core,hw,render}.so,}
-  mv $a/{{data,plugins},share/${pkgname[0]}}
+  mv $a/{{data,plugins},share/$_pkgname}
   mv $a/{python/mitsuba.so,lib/python$_pyver/lib-dynload}
   mv $a/{sdk/include,}
   rmdir $a/{python,sdk}
@@ -124,7 +119,7 @@ package_blender-addon-mitsuba() {
 
   a=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons
   b=$pkgdir/usr/share/licenses/$pkgname
-  c=$srcdir/$_pkgname/doc/license.txt
+  c=$srcdir/$_pkgname-v$_pkgver/doc/license.txt
 
   install -d $a && cp -a $_pkgname $a
   install -d $b && install -m644 $c $b/LICENSE
diff --git a/pcr/monkeysphere/PKGBUILD b/pcr/monkeysphere/PKGBUILD
index d274631eb..f83e05741 100644
--- a/pcr/monkeysphere/PKGBUILD
+++ b/pcr/monkeysphere/PKGBUILD
@@ -4,15 +4,27 @@
 # $Id: PKGBUILD 264 2010-11-10 00:57:53Z shtrom $
 pkgname=monkeysphere
 pkgver=0.35
-pkgrel=4
+pkgrel=5
 pkgdesc="Leverage the OpenPGP web of trust for OpenSSH and Web authentication"
 arch=('any')
 url="http://web.monkeysphere.info/"
 license=('GPL3')
 depends=('gnupg' 'lockfile-progs' 'perl-crypt-openssl-rsa' 'perl-digest-sha1')
-source=(http://archive.monkeysphere.info/debian/pool/${pkgname}/m/${pkgname}/${pkgname}_${pkgver}.orig.tar.gz)
+source=(http://archive.monkeysphere.info/debian/pool/${pkgname}/m/${pkgname}/${pkgname}_${pkgver}.orig.tar.gz
+        binmerge.patch)
 install=monkeysphere.install
-md5sums=('481ac14c9fdef0ccd1944c593bd4f517')
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  patch -Ni "${srcdir}/binmerge.patch"
+}
+
+check() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make test
+}
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -20,3 +32,5 @@ package() {
   make DESTDIR="$pkgdir/" install
   mkdir -p $pkgdir/var/lib/monkeysphere
 } 
+md5sums=('481ac14c9fdef0ccd1944c593bd4f517'
+         'a8bd35dc7dd58b5952beeecafe5045a7')
diff --git a/pcr/monkeysphere/binmerge.patch b/pcr/monkeysphere/binmerge.patch
new file mode 100644
index 000000000..48d945511
--- /dev/null
+++ b/pcr/monkeysphere/binmerge.patch
@@ -0,0 +1,25 @@
+--- Makefile.orig	2013-06-07 13:02:23.123944233 -0300
++++ Makefile	2013-06-07 13:02:43.351065809 -0300
+@@ -36,17 +36,17 @@
+ # this target is to be called from the tarball, not from the git
+ # working dir!
+ install: all installman
+-	mkdir -p $(DESTDIR)$(PREFIX)/bin $(DESTDIR)$(PREFIX)/sbin
++	mkdir -p $(DESTDIR)$(PREFIX)/bin
+ 	mkdir -p $(DESTDIR)$(PREFIX)/share/monkeysphere/m $(DESTDIR)$(PREFIX)/share/monkeysphere/mh $(DESTDIR)$(PREFIX)/share/monkeysphere/ma $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions
+ 	mkdir -p $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere
+ 	mkdir -p $(DESTDIR)$(PREFIX)/share/doc/monkeysphere
+ 	printf "Monkeysphere %s\n" $(MONKEYSPHERE_VERSION) > $(DESTDIR)$(PREFIX)/share/monkeysphere/VERSION
+ 	install src/monkeysphere $(DESTDIR)$(PREFIX)/bin
+ 	sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/bin/monkeysphere
+-	install src/monkeysphere-host $(DESTDIR)$(PREFIX)/sbin
+-	sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-host
+-	install src/monkeysphere-authentication $(DESTDIR)$(PREFIX)/sbin
+-	sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-authentication
++	install src/monkeysphere-host $(DESTDIR)$(PREFIX)/bin
++	sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/bin/monkeysphere-host
++	install src/monkeysphere-authentication $(DESTDIR)$(PREFIX)/bin
++	sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/bin/monkeysphere-authentication
+ 	install src/monkeysphere-authentication-keys-for-user $(DESTDIR)$(PREFIX)/share/monkeysphere
+ 	install -m 0644 src/share/common $(DESTDIR)$(PREFIX)/share/monkeysphere
+ 	install -m 0644 src/share/defaultenv $(DESTDIR)$(PREFIX)/share/monkeysphere
diff --git a/pcr/mosquitto/PKGBUILD b/pcr/mosquitto/PKGBUILD
index 652e75691..2f765ad13 100644
--- a/pcr/mosquitto/PKGBUILD
+++ b/pcr/mosquitto/PKGBUILD
@@ -4,22 +4,27 @@
 
 pkgname=mosquitto
 pkgver=1.1.3
-pkgrel=2
+pkgrel=3
 pkgdesc="An Open Source MQTT v3.1 Broker"
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'mips64el')
 url="http://mosquitto.org/"
 makedepends=('python')
 optdepends=('python: python support')
 license=('BSD')
-source=(http://mosquitto.org/files/source/$pkgname-$pkgver.tar.gz{,.asc} "$pkgname.service" )
+source=(http://mosquitto.org/files/source/$pkgname-$pkgver.tar.gz{,.asc} "$pkgname.service" 
+        "binmerge.patch")
 md5sums=('fd0cae17221d778b0a002c31e6c3de9e'
          'SKIP'
-         'b7cdd7a65d9a7ac5a8c2456f4b1f2d8f')
+         '58af79ed48be928f91e5435cda82bb8b'
+         '27e24b672d63b797f0e026ab85c64c4b')
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver/src"
+  patch -N -i ${srcdir}/binmerge.patch
+}
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  #Remove hardcoded prefix
-  find -name Makefile -exec sed '/prefix=/d' -i {} \;
 
   make prefix=/usr
 }
diff --git a/pcr/mosquitto/binmerge.patch b/pcr/mosquitto/binmerge.patch
new file mode 100644
index 000000000..d6d79041d
--- /dev/null
+++ b/pcr/mosquitto/binmerge.patch
@@ -0,0 +1,21 @@
+--- src/Makefile.orig	2013-06-03 12:23:15.288586121 -0300
++++ src/Makefile	2013-06-03 12:23:29.455571403 -0300
+@@ -90,15 +90,15 @@
+ 	${CC} $(CFLAGS) ${CPPFLAGS} -c $< -o $@
+ 
+ install : all
+-	$(INSTALL) -d ${DESTDIR}$(prefix)/sbin
+-	$(INSTALL) -s mosquitto ${DESTDIR}${prefix}/sbin/mosquitto
++	$(INSTALL) -d ${DESTDIR}$(prefix)/bin
++	$(INSTALL) -s mosquitto ${DESTDIR}${prefix}/bin/mosquitto
+ 	$(INSTALL) mosquitto_plugin.h ${DESTDIR}${prefix}/include/mosquitto_plugin.h
+ ifeq ($(WITH_TLS),yes)
+ 	$(INSTALL) -s mosquitto_passwd ${DESTDIR}${prefix}/bin/mosquitto_passwd
+ endif
+ 
+ uninstall :
+-	-rm -f ${DESTDIR}${prefix}/sbin/mosquitto
++	-rm -f ${DESTDIR}${prefix}/bin/mosquitto
+ 	-rm -f ${DESTDIR}${prefix}/include/mosquitto_plugin.h
+ 	-rm -f ${DESTDIR}${prefix}/bin/mosquitto_passwd
+ 
diff --git a/pcr/mosquitto/mosquitto.service b/pcr/mosquitto/mosquitto.service
index 7e9ef7cc8..9626cbc45 100644
--- a/pcr/mosquitto/mosquitto.service
+++ b/pcr/mosquitto/mosquitto.service
@@ -12,9 +12,9 @@ Requires=network.target
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/mosquitto -c /etc/mosquitto/mosquitto.conf -d
-ExecStartPre=/bin/rm -f /var/run/mosquitto.pid
-PIDFile=/var/run/mosquitto.pid
+ExecStart=/usr/bin/mosquitto -c /etc/mosquitto/mosquitto.conf -d
+ExecStartPre=/usr/bin/rm -f /run/mosquitto.pid
+PIDFile=/run/mosquitto.pid
 Restart=on-abort
 
 [Install]
diff --git a/pcr/nekobee/PKGBUILD b/pcr/nekobee/PKGBUILD
new file mode 100644
index 000000000..4e71ae93d
--- /dev/null
+++ b/pcr/nekobee/PKGBUILD
@@ -0,0 +1,27 @@
+# Maintainer: Guest One <theguestone at gmail dot com>
+
+pkgname=nekobee
+pkgver=0.1.8
+pkgrel=2
+pkgdesc="A TB303-style synthesizer for DSSI"
+url="https://github.com/gordonjcp/nekobee"
+depends=('liblo' 'gtk2')
+makedepends=('dssi' 'python' 'ladspa')
+arch=('i686')
+license=('GPL')
+source=("https://github.com/gordonjcp/${pkgname}/archive/${pkgver}.tar.gz"
+        "nekobee.patch")
+md5sums=('5954ac49043bc80588be72a9b9a9b28f'
+         '8dde87ad9b2a8500c51d773b25b7984f')
+
+build() {
+cd $startdir/src/$pkgname-$pkgver
+patch -p1 -i $srcdir/$pkgname.patch
+./waf configure --prefix=/usr
+./waf
+}
+
+package() {
+cd $startdir/src/$pkgname-$pkgver
+DESTDIR=$pkgdir ./waf install
+}
diff --git a/pcr/nekobee/nekobee.patch b/pcr/nekobee/nekobee.patch
new file mode 100644
index 000000000..dd995c357
--- /dev/null
+++ b/pcr/nekobee/nekobee.patch
@@ -0,0 +1,20 @@
+diff -aur nekobee-0.1.8/wscript nekobee-0.1.8.new/wscript
+--- nekobee-0.1.8/wscript	2010-09-12 21:34:13.000000000 +0200
++++ nekobee-0.1.8.new/wscript	2013-05-25 22:47:23.923441000 +0200
+@@ -31,7 +31,7 @@
+     # DSSI plugin
+     plugin_dssi = bld.new_task_gen('cc', 'shlib')
+     plugin_dssi.env['shlib_PATTERN'] = '%s.so'
+-    plugin_dssi.env.append_value("LINKFLAGS", "-module -avoid-version -Wc,-nostartfiles")
++    plugin_dssi.env.append_value("LINKFLAGS", "-lm")
+     plugin_dssi.includes = ['.', 'src']
+     plugin_dssi.defines = 'HAVE_CONFIG_H'
+     plugin_dssi.source = [
+@@ -49,6 +49,7 @@
+ 
+     # DSSI UI executable
+     gui_gtk = bld.new_task_gen('cc', 'program')
++    gui_gtk.env.append_value("LINKFLAGS", "-lm")
+     gui_gtk.includes = ['.', 'src']
+     gui_gtk.defines = 'HAVE_CONFIG_H'
+     gui_gtk.source = [
diff --git a/pcr/netatalk/PKGBUILD b/pcr/netatalk/PKGBUILD
index f87ce7e2a..b16132dab 100644
--- a/pcr/netatalk/PKGBUILD
+++ b/pcr/netatalk/PKGBUILD
@@ -5,7 +5,7 @@
 # Contributor: Farhan Yousaf <farhany at xaviya dot com>
 
 pkgname=netatalk
-pkgver=3.0.3
+pkgver=3.0.4
 pkgrel=2
 pkgdesc='A kernel-level implementation of AFP services'
 arch=('i686' 'x86_64' 'mips64el')
@@ -19,17 +19,24 @@ options=('!libtool')
 install=$pkgname.install
 changelog=$pkgname.changelog
 source=(http://iweb.dl.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2)
-md5sums=('0a6f3acefd27ad63d2cde6ae4702e1b4')
+md5sums=('f455505884a6aea307640d46a6577fd1')
 
-build() {
+prepare() {
 	cd $pkgname-$pkgver
 
-	sed -i -e 's:"/lib/systemd:"/usr/lib/systemd:' -e 's/x"linux/x"generic/' macros/netatalk.m4
+	sed -i -e 's:AX_CHECK_DOCBOOK:[AX_CHECK_DOCBOOK]:' -e 's:"/lib/systemd:"/usr/lib/systemd:' -e 's/x"linux/x"generic/' macros/netatalk.m4
 	sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' {configure.ac,libevent/configure.in}
 	cp /usr/share/automake*/missing .
+
 	autoreconf -i
+}
+
+build() {
+	cd $pkgname-$pkgver
+
 
   ./configure --prefix=/usr \
+              --sbindir=/usr/bin \
               --localstatedir=/var/state \
               --sysconfdir=/etc \
               --with-init-style=systemd \
diff --git a/pcr/netatalk/netatalk.changelog b/pcr/netatalk/netatalk.changelog
index 712a8e5c1..8e1937a6c 100644
--- a/pcr/netatalk/netatalk.changelog
+++ b/pcr/netatalk/netatalk.changelog
@@ -1,3 +1,15 @@
+2013-06-03 SJ_UnderWater
+
+	* 3.0.4-2:
+	move sbindir
+
+2013-05-26 SJ_UnderWater
+
+	* 3.0.4-1:
+	package update
+	minor fixes
+	dbus-glib dependency
+
 2013-03-27 SJ_UnderWater
 
 	* 3.0.3-1:
diff --git a/pcr/networkmanager-openswan/PKGBUILD b/pcr/networkmanager-openswan/PKGBUILD
new file mode 100644
index 000000000..16ff977b3
--- /dev/null
+++ b/pcr/networkmanager-openswan/PKGBUILD
@@ -0,0 +1,26 @@
+# Contributor: Marti Raudsepp <marti@juffo.org>
+
+pkgname=networkmanager-openswan
+_pkgname=NetworkManager-openswan
+pkgver=0.9.8.0
+pkgrel=1
+pkgdesc="NetworkManager plugin for IPSec VPN tunnels"
+arch=('i686' 'x86_64')
+url="http://ftp.acc.umu.se/pub/GNOME/sources/NetworkManager-openswan/"
+license=('GPL')
+depends=('openswan' 'gtk3' 'networkmanager' 'libgnome-keyring')
+makedepends=('intltool')
+source=(http://ftp.acc.umu.se/pub/GNOME/sources/$_pkgname/0.9/$_pkgname-$pkgver.tar.xz)
+md5sums=('6a373868f85ac3b7c953f7fd6c76e637')
+
+build() {
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/networkmanager
+  make
+}
+
+package() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
diff --git a/pcr/networkmanager-strongswan/PKGBUILD b/pcr/networkmanager-strongswan/PKGBUILD
new file mode 100644
index 000000000..31573dc82
--- /dev/null
+++ b/pcr/networkmanager-strongswan/PKGBUILD
@@ -0,0 +1,32 @@
+# Contributor: Michael Seiwald <michael@mseiwald.at>
+# Maintainer: Dmitry Korzhevin <dkorzhevin at gmail dot com>
+pkgname=networkmanager-strongswan
+_pkgname=NetworkManager-strongswan
+pkgver=1.3.0
+pkgrel=2
+pkgdesc="strongswan NetworkManager plugin"
+arch=('i686' 'x86_64')
+url="http://wiki.strongswan.org/projects/strongswan/wiki/NetworkManager"
+license=('GPL')
+depends=(networkmanager strongswan libgnomeui)
+makedepends=(intltool)
+source=(http://download.strongswan.org/NetworkManager/$_pkgname-$pkgver.tar.gz)
+md5sums=('215f1d3b7b65be236b86bf30b6a4615b')
+
+build() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  ./configure --sysconfdir=/etc \
+              --prefix=/usr \
+              --libexecdir=/usr/lib \
+              --with-charon=/usr/lib/strongswan/charon \
+              CFLAGS="$CFLAGS -Wno-error=unused-local-typedefs"
+  make
+}
+
+package() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+  #make install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/nicotine/PKGBUILD b/pcr/nicotine/PKGBUILD
new file mode 100644
index 000000000..b0bd552b4
--- /dev/null
+++ b/pcr/nicotine/PKGBUILD
@@ -0,0 +1,43 @@
+# Maintainer: Guest One <theguestone at gmail dot com>
+
+pkgname=nicotine
+pkgver=1.2.16
+pkgrel=1
+pkgdesc="Soulseek music-sharing client, written in python"
+arch=('i686')
+url='http://sourceforge.net/projects/nicotine-plus/'
+license=('GPL')
+depends=('pygtk' 'mutagen' 'python2-sexy')
+makedepends=('setconf')
+optdepends=('python2-geoip: to enable Geographical blocker')
+source=("http://downloads.sourceforge.net/project/nicotine-plus/nicotine-plus/${pkgver}/${pkgname}+-${pkgver}.tar.bz2")
+sha256sums=('71e5b33e273daaf072dbf63839536c14d7ead9d149323d50eee09f7429e34c1d')
+
+prepare() {
+  cd "$srcdir/${pkgname}+-$pkgver"
+
+  # Fix for FS#22476
+  setconf files/nicotine.desktop Icon nicotine-plus-32px
+
+  # Python fix
+  sed -i -e 's|/usr/bin/env python|/usr/bin/env python2|' \
+    -e 's|/usr/bin/python|/usr/bin/python2|' pynicotine/{,gtkgui/}*.py
+} 
+
+build() {
+  cd "$srcdir/${pkgname}+-$pkgver/trayicon"
+
+  python2 autogen.py
+  make 
+}
+
+package() {
+  cd "$srcdir/${pkgname}+-$pkgver"
+
+  python2 setup.py install --root="$pkgdir"
+  cd trayicon
+  make DESTDIR="$pkgdir" install 
+  ln -s nicotine.py "$pkgdir/usr/bin/nicotine"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/nppangband-libre/PKGBUILD b/pcr/nppangband-libre/PKGBUILD
new file mode 100644
index 000000000..eeb59f6fc
--- /dev/null
+++ b/pcr/nppangband-libre/PKGBUILD
@@ -0,0 +1,33 @@
+# Maintainer: Israfel <israfel@lavabit.com>
+# Original PKGBUILD by James Rayner <iphitus@gmail.com> 
+# The Angband "adjust-sound-dir" patch by Chris Carr <rantingman@gmail.com> served as a reference for what files to edit for sound.patch
+
+_pkgname=nppangband
+pkgname=nppangband-libre
+pkgver=6.1.2
+pkgrel=1
+pkgdesc="A variant of Angband that attempts to take popular ideas from other variants, without nonfree sound effects"
+url="http://forum.nppangband.org/"
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname
+depends=('sdl' 'sdl_image' 'sdl_ttf' 'sdl_mixer' 'ncurses' 'libx11' 'freetype2')
+source=(http://download.nppangband.org/npp-6.1.2-src.zip sound.patch)
+license=('GPLv2 custom')
+arch=('i686' 'x86_64')
+
+build() {
+	cd $srcdir/npp-6.1.2-src/
+	patch -Np1 -i ../sound.patch
+	sh autogen.sh
+	./configure --enable-sdl
+	make
+}
+
+package() {  
+	cd $srcdir/npp-6.1.2-src/
+	make DESTDIR="$pkgdir/" install
+}
+
+sha512sums=('e12e05fd8944bb1d7e43b883416009a8e77198ee1ad0ea87480eaafb5f46ecdb218ef0b68876fb77cc2ab490a99f9b9303e02c7db385db6eb8d1d01a48cffdd0'
+            '820f4e678543b8f4d5092d6654bb3d4006e039fbc119d9ff5f468c01176497c25579ca2b0d6f6d302b11a3fbfaa6cfcdf89029ff586cda31d97e413cb8b91040')
diff --git a/pcr/nppangband-libre/sound.patch b/pcr/nppangband-libre/sound.patch
new file mode 100644
index 000000000..9de2b0177
--- /dev/null
+++ b/pcr/nppangband-libre/sound.patch
@@ -0,0 +1,241 @@
+# Made by Israfel <israfel@lavabit.com> for the Parabola GNU/Linux-Libre "nppangband-libre" package
+# The Angband "adjust-sound-dir" patch by Chris Carr <rantingman@gmail.com> served as a reference for what files to edit
+diff -crB npp-6.1.2-src/COPYING npp-6.1.2-src-libre/COPYING
+*** npp-6.1.2-src/COPYING	2013-03-29 14:37:32.000000000 -0400
+--- npp-6.1.2-src-libre/COPYING	2013-06-29 16:22:09.154804370 -0400
+***************
+*** 13,20 ****
+   * David Gervais' (32x32) graphics, including modifications and additional tiles by Jeff Greene, Thacker and Rob Fiala for NPPAngband may be redistributed, 
+  modified, and used only under the terms of the Creative Commons Attribution 3.0 licence: http://creativecommons.org/licenses/by/3.0/
+  
+-  * the sounds are freeware, whatever that means.
+- 
+   * the font files are under the licences noted in lib/xtra/font/copying.txt,
+     all of which are OSI-compliant.
+  
+--- 13,18 ----
+Only in npp-6.1.2-src/lib/xtra/sound: breath.wav
+Only in npp-6.1.2-src/lib/xtra/sound: clunk.wav
+Only in npp-6.1.2-src/lib/xtra/sound: death.wav
+Only in npp-6.1.2-src/lib/xtra/sound: destroy.wav
+Only in npp-6.1.2-src/lib/xtra/sound: drop.wav
+Only in npp-6.1.2-src/lib/xtra/sound: eat.wav
+Only in npp-6.1.2-src/lib/xtra/sound: flee.wav
+Only in npp-6.1.2-src/lib/xtra/sound: hallu.wav
+Only in npp-6.1.2-src/lib/xtra/sound: hit1.wav
+Only in npp-6.1.2-src/lib/xtra/sound: hit.wav
+Only in npp-6.1.2-src/lib/xtra/sound: kill1.wav
+Only in npp-6.1.2-src/lib/xtra/sound: kill.wav
+Only in npp-6.1.2-src/lib/xtra/sound: level.wav
+diff -crB npp-6.1.2-src/lib/xtra/sound/Makefile npp-6.1.2-src-libre/lib/xtra/sound/Makefile
+*** npp-6.1.2-src/lib/xtra/sound/Makefile	2013-03-29 14:37:36.000000000 -0400
+--- npp-6.1.2-src-libre/lib/xtra/sound/Makefile	2013-06-29 16:21:53.525414705 -0400
+***************
+*** 1,10 ****
+  MKPATH=../../../mk/
+  include $(MKPATH)buildsys.mk
+  
+! LIBDATA = sound.cfg breath.wav clunk.wav death.wav destroy.wav \
+! drop.wav eat.wav flee.wav hallu.wav hit.wav hit1.wav kill.wav \
+! kill1.wav level.wav miss.wav miss1.wav money.wav opendoor.wav \
+! shutdoor.wav thump.wav vomit.wav \
+  
+  PACKAGE = xtra/sound
+  
+--- 1,7 ----
+  MKPATH=../../../mk/
+  include $(MKPATH)buildsys.mk
+  
+! LIBDATA = sound.cfg
+  
+  PACKAGE = xtra/sound
+  
+Only in npp-6.1.2-src/lib/xtra/sound: miss1.wav
+Only in npp-6.1.2-src/lib/xtra/sound: miss.wav
+Only in npp-6.1.2-src/lib/xtra/sound: money.wav
+Only in npp-6.1.2-src/lib/xtra/sound: opendoor.wav
+Only in npp-6.1.2-src/lib/xtra/sound: shutdoor.wav
+diff -crB npp-6.1.2-src/lib/xtra/sound/sound.cfg npp-6.1.2-src-libre/lib/xtra/sound/sound.cfg
+*** npp-6.1.2-src/lib/xtra/sound/sound.cfg	2013-03-29 14:37:38.000000000 -0400
+--- npp-6.1.2-src-libre/lib/xtra/sound/sound.cfg	2013-06-29 16:20:47.241336459 -0400
+***************
+*** 41,59 ****
+  #
+  
+  # The shopkeep bought a worthless item.
+! store1 = money.wav
+  
+  # The shopkeep paid too much for an item.
+! store2 = money.wav
+  
+  # The shopkeep got away with a good bargain.
+! store3 = money.wav
+  
+  # The shopkeep got away with a great bargain.
+! store4 = money.wav
+  
+  # You make a normal transaction (buying or selling).
+! store5 = money.wav
+  
+  # You enter a store.
+  store_enter =
+--- 41,59 ----
+  #
+  
+  # The shopkeep bought a worthless item.
+! store1 =
+  
+  # The shopkeep paid too much for an item.
+! store2 =
+  
+  # The shopkeep got away with a good bargain.
+! store3 =
+  
+  # The shopkeep got away with a great bargain.
+! store4 =
+  
+  # You make a normal transaction (buying or selling).
+! store5 =
+  
+  # You enter a store.
+  store_enter =
+***************
+*** 69,75 ****
+  #
+  
+  # You succeed in a melee attack against a monster.
+! hit = hit.wav drop.wav hit1.wav
+  
+  # It was a good hit!
+  hit_good =
+--- 69,75 ----
+  #
+  
+  # You succeed in a melee attack against a monster.
+! hit =
+  
+  # It was a good hit!
+  hit_good =
+***************
+*** 87,93 ****
+  hit_hi_superb =
+  
+  # You miss a melee attack against a monster.
+! miss = miss.wav miss1.wav
+  
+  # You fire a missile.
+  shoot =
+--- 87,93 ----
+  hit_hi_superb =
+  
+  # You miss a melee attack against a monster.
+! miss =
+  
+  # You fire a missile.
+  shoot =
+***************
+*** 99,105 ****
+  hitpoint_warn =
+  
+  # You die.
+! death = death.wav
+  
+  #
+  # Player sounds - status changes
+--- 99,105 ----
+  hitpoint_warn =
+  
+  # You die.
+! death =
+  
+  #
+  # Player sounds - status changes
+***************
+*** 197,206 ****
+  money3 =
+  
+  # You (or a monster) drop something on the ground.
+! drop = clunk.wav
+  
+  # You gain (or regain) a level.
+! level = level.wav
+  
+  # You successfully study a spell or prayer.
+  study =
+--- 197,206 ----
+  money3 =
+  
+  # You (or a monster) drop something on the ground.
+! drop =
+  
+  # You gain (or regain) a level.
+! level =
+  
+  # You successfully study a spell or prayer.
+  study =
+***************
+*** 224,242 ****
+  hitwall =
+  
+  # You eat something.
+! eat = eat.wav
+  
+  # You successfully dig through something.
+! dig = thump.wav
+  
+  # You open a door.
+! opendoor = opendoor.wav
+  
+  # You shut a door.
+! shutdoor = shutdoor.wav
+  
+  # You teleport from a level (including via recall).
+! tplevel = teleport.wav
+  
+  # Default "bell" sound for system messages.
+  bell =
+--- 224,242 ----
+  hitwall =
+  
+  # You eat something.
+! eat =
+  
+  # You successfully dig through something.
+! dig =
+  
+  # You open a door.
+! opendoor =
+  
+  # You shut a door.
+! shutdoor =
+  
+  # You teleport from a level (including via recall).
+! tplevel =
+  
+  # Default "bell" sound for system messages.
+  bell =
+***************
+*** 291,300 ****
+  #
+  
+  # A monster flees in terror.
+! flee = flee.wav
+  
+  # A monster is killed.
+! kill = kill.wav destroy.wav kill1.wav
+  
+  # A unique is killed.
+  kill_unique =
+--- 291,300 ----
+  #
+  
+  # A monster flees in terror.
+! flee =
+  
+  # A monster is killed.
+! kill =
+  
+  # A unique is killed.
+  kill_unique =
+Only in npp-6.1.2-src/lib/xtra/sound: thump.wav
+Only in npp-6.1.2-src/lib/xtra/sound: vomit.wav
diff --git a/pcr/ocsync/PKGBUILD b/pcr/ocsync/PKGBUILD
index 34ce2f62c..97bc26754 100644
--- a/pcr/ocsync/PKGBUILD
+++ b/pcr/ocsync/PKGBUILD
@@ -1,6 +1,7 @@
 # Maintainer: Kuba Serafinowski <zizzfizzix(at)gmail(dot)com>
 # https://github.com/zizzfizzix/pkgbuilds
-
+# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
+#
 ##############################################################
 #### The section below can be adjusted to suit your needs ####
 ##############################################################
@@ -14,28 +15,31 @@ _buildtype="Release"
 ##############################################################
 
 pkgname=ocsync
-pkgver=0.70.5
-pkgrel=1
-pkgdesc="A file synchronizer especially designed for you, the normal user."
+pkgver=0.80.0
+pkgrel=3
+pkgdesc="A file synchronizer especially designed for you, the normal user. Dependency of owncloud-client."
 arch=("i686" "x86_64")
 url="http://www.csync.org"
 license=('GPL2')
-depends=('sqlite3' 'iniparser' 'neon' 'smbclient' 'libssh')
+depends=('sqlite3' 'iniparser' 'neon')
 makedepends=('cmake')
-#optdepends=('samba: smb support' 'libssh: sftp support')
+optdepends=('libssh: sftp support')
 provides=('csync' 'csync-owncloud')
 conflicts=('csync' 'csync-owncloud')
+backup=('etc/ocsync/ocsync.conf' 'etc/ocsync/ocsync_exclude.conf')
 source=("http://download.owncloud.com/download/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('7c8b6f260cc53d29c4355f6837990329')
+md5sums=('db46cdb4c710a607dfc062ed0a413b35')
 
-# Clean options array to strip pkg if release buildtype is chosen
-if [[ ${_buildtype} == "Release" ]] || [[ ${_buildtype} == "release" ]]; then
-  options=()
+if [[ ! ${_buildtype} == "Release" ]] && [[ ! ${_buildtype} == "release" ]]; then
+  options=(!strip)
 fi
 
-build() {
+prepare() {
   if [[ -e ${srcdir}/${pkgname}-${pkgver}-build ]]; then rm -rf ${srcdir}/${pkgname}-${pkgver}-build; fi
   mkdir ${srcdir}/${pkgname}-${pkgver}-build
+}
+
+build() {
   cd ${srcdir}/${pkgname}-${pkgver}-build
   
   cmake -DCMAKE_BUILD_TYPE=${_buildtype} \
diff --git a/pcr/opendnssec/LICENSE b/pcr/opendnssec/LICENSE
new file mode 100644
index 000000000..5700d408a
--- /dev/null
+++ b/pcr/opendnssec/LICENSE
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2009 Nominet UK. All rights reserved.
+ * Copyright (c) 2010 .SE (The Internet Infrastructure Foundation).
+ * Copyright (c) 2009 NLNet Labs.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ *  Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+ *
+ *  Permission to use, copy, modify, and distribute this software for any
+ *  purpose with or without fee is hereby granted, provided that the above
+ *  copyright notice and this permission notice appear in all copies.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ *  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ *  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ *  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ *  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ *  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/* pkcs11.h
+   Copyright 2006, 2007 g10 Code GmbH
+   Copyright 2006 Andreas Jellinghaus
+
+   This file is free software; as a special exception the author gives
+   unlimited permission to copy and/or distribute it, with or without
+   modifications, as long as this notice is preserved.
+
+   This file is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY, to the extent permitted by law; without even
+   the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+   PURPOSE.  */
\ No newline at end of file
diff --git a/pcr/opendnssec/PKGBUILD b/pcr/opendnssec/PKGBUILD
new file mode 100644
index 000000000..065a1ec68
--- /dev/null
+++ b/pcr/opendnssec/PKGBUILD
@@ -0,0 +1,77 @@
+# Maintainer: Javier Torres <javitonino [at] gmail [dot] com>
+
+pkgname=opendnssec
+pkgver=1.4.0
+pkgrel=3
+pkgdesc="Turn-key solution for DNSSEC (sqlite3)"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.opendnssec.org/"
+license=('BSD')
+depends=('libxml2' 'ldns' 'sqlite3' 'softhsm')
+backup=("etc/opendnssec/conf.xml"
+        "etc/opendnssec/kasp.xml"
+        "etc/opendnssec/zonelist.xml")
+install="opendnssec.install"
+source=("http://www.opendnssec.org/files/source/${pkgname}-${pkgver}.tar.gz"{,.sig}
+        "pid-path.patch"
+        "ods-signer.service"
+        "ods-enforcer.service")
+sha256sums=('36d4926dcdf351a527ad7600b151ab6cc56d0a472a7eb8871eecd70afef9e101'
+            'SKIP'
+            '487a4c05a07feb97c865ddc4c13d00eea6ce8b2b1e5031983c15484f4991ebed'
+            '1a8cdec0e97a33048956268b766da570f8f7a90d05af59e547219f1381832071'
+            '75cecbfb0ece13957a68a5bc39c20a1d69b95373e7473545d70621e1732733d8')
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  # /var/lib/run -> /var/run
+  patch -p0 -i "${srcdir}/pid-path.patch"
+
+  aclocal
+  autoconf
+  automake --add-missing
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  ./configure --prefix=/usr \
+              --datarootdir=/usr/share \
+              --localstatedir=/var/lib \
+              --sysconfdir=/etc \
+              --with-pkcs11-softhsm=/usr/lib/libsofthsm.so \
+              --sbindir=/usr/bin
+
+  # Create the correct (/var/run/opendnssec) directory
+  sed -i \
+  -e "s/\$(INSTALL) -d \$(DESTDIR)\$(localstatedir)\/run\/opendnssec/#Removed/" \
+  -e "s/\$(INSTALL) -d \$(DESTDIR)\$(localstatedir)\/run/\$(INSTALL) -d \$(DESTDIR)\$(OPENDNSSEC_PID_DIR)/" \
+  Makefile
+
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  install -d "${pkgdir}/var/run/opendnssec"
+
+  make DESTDIR="${pkgdir}" install
+
+  install -d "${pkgdir}/etc/rc.d"
+  install -Dm0644 "${srcdir}/ods-signer.service" \
+        "${pkgdir}/usr/lib/systemd/system/ods-signer.service"
+  install -Dm0644 "${srcdir}/ods-enforcer.service" \
+        "${pkgdir}/usr/lib/systemd/system/ods-enforcer.service"
+  install -Dm0644 "LICENSE" \
+        "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dm0644 "enforcer/utils/migrate_adapters_1.sqlite3" \
+        "${pkgdir}/usr/share/opendnssec"
+
+  chown -R 227:227 "${pkgdir}/etc/opendnssec" \
+                   "${pkgdir}/var/lib/opendnssec" \
+                   "${pkgdir}/var/run/opendnssec" 
+  chmod 750 "${pkgdir}/etc/opendnssec" \
+            "${pkgdir}/var/lib/opendnssec" \
+            "${pkgdir}/var/run/opendnssec" 
+}
diff --git a/pcr/opendnssec/ods-enforcer.service b/pcr/opendnssec/ods-enforcer.service
new file mode 100644
index 000000000..f0d0050d0
--- /dev/null
+++ b/pcr/opendnssec/ods-enforcer.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=OpenDNSSEC Enforcer
+After=syslog.target network.target
+
+[Service]
+Type=forking
+PIDFile=/run/opendnssec/enforcerd.pid
+ExecStart=/usr/bin/ods-control enforcer start
+ExecStop=/usr/bin/ods-control enforcer stop
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/pcr/opendnssec/ods-signer.service b/pcr/opendnssec/ods-signer.service
new file mode 100644
index 000000000..26cc03481
--- /dev/null
+++ b/pcr/opendnssec/ods-signer.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=OpenDNSSEC Signer
+After=syslog.target nerwork.target
+
+[Service]
+Type=forking
+PIDFile=/run/opendnssec/signerd.pid
+ExecStart=/usr/bin/ods-control signer start
+ExecStop=/usr/bin/ods-control signer stop
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/pcr/opendnssec/opendnssec.install b/pcr/opendnssec/opendnssec.install
new file mode 100644
index 000000000..0c74659ee
--- /dev/null
+++ b/pcr/opendnssec/opendnssec.install
@@ -0,0 +1,27 @@
+post_install() {
+    if [ -z "`grep '^opendnssec:' /etc/group`" ]; then
+        groupadd -g 227 opendnssec
+    fi
+    if [ -z "`grep '^opendnssec:' /etc/passwd`" ]; then
+        useradd -u 227 -d /var/lib/opendnssec -g opendnssec -s /bin/false opendnssec
+    fi
+
+    echo ">> You need an HSM implementation (try softhsm)"
+}
+
+
+post_upgrade() {
+    post_install $1
+    OLD=$(echo $2 | sed "s/\(.*\)\.\(.*\)\.\(.*\)/\1\.\2/g")
+    NEW=$(echo $1 | sed "s/\(.*\)\.\(.*\)\.\(.*\)/\1\.\2/g")
+    if [ $OLD != "1.4" -a $NEW == "1.4" ]; then
+        echo ">> NOTICE: UPGRADE TO 1.4"
+        echo "This update requires upgrading the database"
+        echo "Run /usr/share/opendnssec/migrate_adapters_1.sqlite3 on your kasp database"
+	echo "e.g: sqlite3 kasp.db < /usr/share/opendnssec/migrate_adapters_1.sqlite3"
+    fi
+}
+
+post_remove() {
+    userdel opendnssec
+}
diff --git a/pcr/opendnssec/pid-path.patch b/pcr/opendnssec/pid-path.patch
new file mode 100644
index 000000000..88c750cf2
--- /dev/null
+++ b/pcr/opendnssec/pid-path.patch
@@ -0,0 +1,24 @@
+--- Makefile.am	2012-07-17 08:53:51.000000000 +0200
++++ Makefile.am	2012-11-20 21:56:11.000000000 +0100
+@@ -30,8 +30,8 @@
+ 	$(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/signconf
+ 	$(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/unsigned
+ 	$(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/signed
+-	$(INSTALL) -d $(DESTDIR)$(localstatedir)/run
+-	$(INSTALL) -d $(DESTDIR)$(localstatedir)/run/opendnssec
++	$(INSTALL) -d $(DESTDIR)/var/run
++	$(INSTALL) -d $(DESTDIR)/var/run/opendnssec
+ 
+ docs:
+ 	(cd libhsm; $(MAKE) doxygen)
+--- m4/opendnssec_common.m4	2012-11-01 11:56:59.000000000 +0100
++++ m4/opendnssec_common.m4	2012-11-20 21:52:56.000000000 +0100
+@@ -19,7 +19,7 @@
+ OPENDNSSEC_DATA_DIR=$full_datadir/opendnssec
+ OPENDNSSEC_SYSCONF_DIR=$full_sysconfdir/opendnssec
+ OPENDNSSEC_LOCALSTATE_DIR="$full_localstatedir/opendnssec"
+-OPENDNSSEC_PID_DIR="$full_localstatedir/run/opendnssec"
++OPENDNSSEC_PID_DIR="/var/run/opendnssec"
+ 
+ AC_SUBST([OPENDNSSEC_BIN_DIR])
+ AC_SUBST([OPENDNSSEC_SBIN_DIR])
diff --git a/pcr/openhpi/PKGBUILD b/pcr/openhpi/PKGBUILD
new file mode 100644
index 000000000..bffcc74ba
--- /dev/null
+++ b/pcr/openhpi/PKGBUILD
@@ -0,0 +1,185 @@
+# Maintainer: Márcio Silva <coadde@lavabit.com>
+
+pkgname=openhpi
+pkgver=3.2.0
+pkgrel=4
+pkgdesc='Abstracted interface for managing computer hardware, typically chassis and rack based servers'
+arch=(
+  i686
+  x86_64
+  mips64el
+)
+url=http://www.$pkgname.org/
+license=custom
+depends=(
+  libxml2
+  net-snmp
+)
+options=(!libtool)
+source=http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
+sha512sums=5a54ccc2279b3a608e2842dd3b4f01d7d483182ecd33d1d33186247cea15b62f1e0aea4eea1294cd6c3959a25424dc322cca73e516f4c8fd9d3a41a949d087ab
+
+prepare() {
+  cd $srcdir/$pkgname-$pkgver
+
+  _automake=$(automake --version | grep automake | sed 's|automake (GNU automake) ||')
+  sed -i "/am__api_version=/ s|1.12|${_automake::4}|;
+         " $(grep -rl am__api_version=)
+
+  #sed -i 's|INCLUDES|AM_CPPFLAGS|;
+  #       ' $(grep -rl INCLUDES | grep Makefile.am)
+
+  # fixing path
+  sed -i 's|bin/sh|usr/bin/bash|;
+         ' $(grep -rl bin/sh)
+  sed -i 's| /bin| /usr/bin|;
+         ' $(grep -rl ' /bin')
+  sed -i 's| /sbin| /usr/bin|;
+         ' $(grep -rl ' /sbin')
+  sed -i 's|usr/sbin|usr/bin|;
+         ' $(grep -rl usr/sbin)
+  #sed -i 's|/lib64|/lib|;
+  #       ' $(grep -rl /lib64)
+  sed -i 's|usr/libexec|usr/lib|;
+         ' $(grep -rl usr/libexec)
+  sed -i 's|var/lock|run/lock|;
+         ' $(grep -rl var/lock)
+  sed -i 's|var/run|run|;
+         ' $(grep -rl var/run)
+
+  # remove Open Source term
+  #sed -i 's|Open Source / ||;
+  #        s|open source / ||;
+  #        s|Open Source|Free Software|;
+  #        s|open source|free software|;
+  #        s|Free Software Development Lab|Open Source Development Lab|;
+  #       ' $(grep -ril 'open source')
+  #sed -i 's|OpenSource / ||;
+  #        s|opensource / ||;
+  #        s|OpenSource|FreeSoftware|;
+  #        s|opensource|freesoftware|;
+  #        s|freesoftware.org|opensource.org|;
+  #        s|http://www.opensource.org/|http://www.gnu.org/philosophy/free-sw.html|;
+  #        s|http://www.gnu.org/philosophy/free-sw.htmllicenses/osl-|http://opensource.org/licenses/osl-|;
+  #        s|http://www.gnu.org/philosophy/free-sw.htmlosd|http://opensource.org/osd|;
+  #       ' $(grep -ril opensource)
+
+  # remove Linux term
+  sed -i 's|Linux,|GNU/Linux,|;
+          s|Linux and|GNU/Linux and|;
+          s|Linux distro|GNU/Linux distro|;
+          s|Linux distribution|GNU/Linux distribution|;
+          s|Linux machine|GNU/Linux machine|;
+          s|Linux Only|GNU/Linux Only|;
+          s|Linux only|GNU/Linux only|;
+          s|Linux operating|GNU/Linux operating|;
+          s|Linux OS|GNU/Linux OS|;
+          s|Linux platform|GNU/Linux platform|;
+          s|Linux software|GNU/Linux software|;
+          s|Linux specific|GNU/Linux specific|;
+          s|Linux system|GNU/Linux system|;
+          s|Linux will|GNU/Linux will|;
+          s|# Linux$|# GNU/Linux|;
+          s|# Linux.$|# GNU/Linux.|;
+          s|* Linux$|* GNU/Linux|;
+          s|* Linux.$|* GNU/Linux.|;
+          s|// Linux$|// GNU/Linux|;
+          s|// Linux.$|// GNU/Linux.|;
+          s|, Linux|, GNU/Linux|;
+          s|As Linux|As GNU/Linux|;
+          s|as Linux|as GNU/Linux|;
+          s|And Linux|And GNU/Linux|;
+          s|and Linux|and GNU/Linux|;
+          s|Be Linux|Be GNU/Linux|;
+          s|be Linux|be GNU/Linux|;
+          s|Because Linux|Because GNU/Linux|;
+          s|because Linux|because GNU/Linux|;
+          s|e.g. Linux|e.g. GNU/Linux|;
+          s|For Linux|For GNU/Linux|;
+          s|for Linux|for GNU/Linux|;
+          s|In Linux|In GNU/Linux|;
+          s|in Linux|in GNU/Linux|;
+          s|Like Linux|Like GNU/Linux|;
+          s|like Linux|like GNU/Linux|;
+          s|non-Linux|non GNU/Linux|;
+          s|Of Linux|Of GNU/Linux|;
+          s|of Linux|of GNU/Linux|;
+          s|On Linux|On GNU/Linux|;
+          s|on Linux|on GNU/Linux|;
+          s|OS type: Linux|OS type: GNU/Linux|;
+          s|Other Linux|Other GNU/Linux|;
+          s|other Linux|other GNU/Linux|;
+          s|The Linux|The GNU/Linux|;
+          s|the Linux|the GNU/Linux|;
+          s|Typically Linux|Typically GNU/Linux|;
+          s|typically Linux|typically GNU/Linux|;
+          s|To Linux|To GNU/Linux|;
+          s|to Linux|to GNU/Linux|;
+          s|Under Linux|Under GNU/Linux|;
+          s|under Linux|under GNU/Linux|;
+          s|ArchGNU/Linux|ArchLinux|;
+          s|e2fsprogs, typically GNU/Linux|e2fsprogs, typically Linux|;
+          s|GNU/GNU|GNU|;
+          s|GNU/Linux device|Linux device|;
+          s|GNU/Linux Director Daemon|Linux Director Daemon|;
+          s|GNU/Linux is a registered trademark of Linus Torvalds|Linux is a registered trademark of Linus Torvalds|;
+          s|GNU/Linux kernel|Linux kernel|;
+          s|GNU/Linux specific kernel|Linux specific kernel|;
+          s|GNU/Linux Standard Base|Linux Standard Base|;
+          s|GNU/Linux sysfs|Linux sysfs|;
+          s|GNU/Linux Virtual Server|Linux Virtual Server|;
+          s|GNU/Linux Watchdog|Linux Watchdog|;
+          s|GNU/Linux watchdog|Linux watchdog|;
+          s|GNU/LinuxHA|LinuxHA|;
+          s|GNU/Linux-HA|Linux-HA|;
+          s|GNU/LinuxSCSI|LinuxSCSI|;
+          s|HA GNU/Linux|HA Linux|;
+          s|High-Availability GNU/Linux|High-Availability Linux|;
+          s|MkGNU/Linux|MkLinux|;
+          s|SEGNU/Linux|SELinux|;
+          s|VA GNU/Linux Cluster|VA Linux Cluster|;
+         ' $(grep -rl Linux)
+}
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  setarch $CARCH ./configure --prefix=/usr\
+    --disable-static\
+    --enable-clients\
+    --enable-dynamic_simulator\
+    --enable-ilo2_ribcl\
+    --enable-ipmidirect\
+    --enable-man\
+    --enable-oa_soap\
+    --enable-simulator\
+    --enable-slave\
+    --enable-snmp_bc\
+    --enable-sysfs\
+    --enable-test_agent\
+    --enable-watchdog\
+    --localstatedir=/var\
+    --sbindir=/usr/bin\
+    --sysconfdir=/etc
+  setarch $CARCH make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  setarch $CARCH make DESTDIR=$pkgdir install
+
+  rm $pkgdir/etc/init.d/openhpid && rmdir $pkgdir/etc/init.d
+
+  install -d $pkgdir/usr/lib/systemd/system
+  echo '[Unit]'                                                           >  $pkgdir/usr/lib/systemd/system/openhpi.service
+  echo 'Description=Enable OpenHPI service which is provided by openhpid' >> $pkgdir/usr/lib/systemd/system/openhpi.service
+  echo 'After=network.target remote-fs.target'                            >> $pkgdir/usr/lib/systemd/system/openhpi.service
+  echo ''                                                                 >> $pkgdir/usr/lib/systemd/system/openhpi.service
+  echo '[Service]'                                                        >> $pkgdir/usr/lib/systemd/system/openhpi.service
+  echo 'Type=forking'                                                     >> $pkgdir/usr/lib/systemd/system/openhpi.service
+  echo 'ExecStart=/usr/bin/openhpid -c /etc/openhpi/openhpi.conf'         >> $pkgdir/usr/lib/systemd/system/openhpi.service
+  echo ''                                                                 >> $pkgdir/usr/lib/systemd/system/openhpi.service
+  echo '[Install]'                                                        >> $pkgdir/usr/lib/systemd/system/openhpi.service
+  echo 'WantedBy=multi-user.target'                                       >> $pkgdir/usr/lib/systemd/system/openhpi.service
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/openipmi/PKGBUILD b/pcr/openipmi/PKGBUILD
new file mode 100644
index 000000000..cced11d05
--- /dev/null
+++ b/pcr/openipmi/PKGBUILD
@@ -0,0 +1,177 @@
+# Maintainer: Márcio Silva <coadde@lavabit.com>
+
+pkgname=openipmi
+_pkgname1=${pkgname::4}
+_pkgname2=${pkgname:4}
+_pkgname=${_pkgname1^}${_pkgname2^^}
+pkgver=2.0.19
+_pkgver=${pkgver::3}
+pkgrel=3
+pkgdesc="Allow access to platform information using Intelligent Platform Management Interface (${_pkgname2^^})"
+arch=(
+  i686
+  x86_64
+  mips64el
+)
+url=http://sourceforge.net/projects/$pkgname/
+depends=(
+  glib
+  net-snmp
+  #python2
+  swig
+  tcl
+)
+makedepends=(
+  dia
+  ghostscript-libre
+  texlive-bibtexextra
+)
+options=(!libtool)
+license=(
+  BSD-new
+  GPL2
+  LGPL2.1
+)
+source=http://downloads.sourceforge.net/project/$pkgname/$_pkgname' '$_pkgver' 'Library/$_pkgname-$pkgver.tar.gz
+sha512sums=ee95eb64b7cde3f22c8444a5f8e3172808b0bb9a3a7034c1302c5f568c1cc0852a44ccc836924267b5f9901f7a8a3f4c66272cc0b663aa55689d7529841217cb
+
+prepare() {
+  cd $srcdir/$_pkgname-$pkgver
+
+  #mv configure.{in,ac}
+
+  #_automake=$(automake --version | grep automake | sed 's|automake (GNU automake) ||')
+  #sed -i "/am__api_version=/ s|1.11|${_automake::4}|;
+  #       " $(grep -rl am__api_version=)
+
+  #sed -i "s|AC_INIT(README.Force)|AC_INIT(OpenIPMI, $pkgver|;
+  #       " configure.ac
+  #sed -i 's|AM_INIT_AUTOMAKE(OpenIPMI, ${OPENIPMI_VERSION_MAJOR}.${OPENIPMI_VERSION_MINOR}.${OPENIPMI_VERSION_RELEASE}${OPENIPMI_VERSION_EXTRA})|AM_INIT_AUTOMAKE|;
+  #       ' configure.ac
+
+  # fixing path
+  sed -i 's|bin/sh|usr/bin/bash|;
+         ' $(grep -rl bin/sh)
+  sed -i 's| /bin| /usr/bin|;
+         ' $(grep -rl ' /bin')
+  sed -i 's| /sbin| /usr/bin|;
+         ' $(grep -rl ' /sbin')
+  sed -i 's|usr/sbin|usr/bin|;
+         ' $(grep -rl usr/sbin)
+  #sed -i 's|/lib64|/lib|;
+  #       ' $(grep -rl /lib64)
+  sed -i 's|usr/libexec|usr/lib|;
+         ' $(grep -rl usr/libexec)
+  sed -i 's|var/lock|run/lock|;
+         ' $(grep -rl var/lock)
+  #sed -i 's|var/run|run|;
+  #       ' $(grep -rl var/run)
+
+  # remove Open Source term
+  sed -i 's|Open Source / ||;
+          s|open source / ||;
+          s|Open Source|Free Software|;
+          s|open source|free software|;
+          s|Free Software Development Lab|Open Source Development Lab|;
+         ' $(grep -ril 'open source')
+  #sed -i 's|OpenSource / ||;
+  #        s|opensource / ||;
+  #        s|OpenSource|FreeSoftware|;
+  #        s|opensource|freesoftware|;
+  #        s|freesoftware.org|opensource.org|;
+  #        s|http://www.opensource.org/|http://www.gnu.org/philosophy/free-sw.html|;
+  #        s|http://www.gnu.org/philosophy/free-sw.htmllicenses/osl-|http://opensource.org/licenses/osl-|;
+  #        s|http://www.gnu.org/philosophy/free-sw.htmlosd|http://opensource.org/osd|;
+  #       ' $(grep -ril opensource)
+
+  # remove Linux term
+  sed -i 's|Linux,|GNU/Linux,|;
+          s|Linux and|GNU/Linux and|;
+          s|Linux distro|GNU/Linux distro|;
+          s|Linux distribution|GNU/Linux distribution|;
+          s|Linux machine|GNU/Linux machine|;
+          s|Linux Only|GNU/Linux Only|;
+          s|Linux only|GNU/Linux only|;
+          s|Linux operating|GNU/Linux operating|;
+          s|Linux OS|GNU/Linux OS|;
+          s|Linux platform|GNU/Linux platform|;
+          s|Linux software|GNU/Linux software|;
+          s|Linux specific|GNU/Linux specific|;
+          s|Linux system|GNU/Linux system|;
+          s|Linux will|GNU/Linux will|;
+          s|# Linux$|# GNU/Linux|;
+          s|# Linux.$|# GNU/Linux.|;
+          s|* Linux$|* GNU/Linux|;
+          s|* Linux.$|* GNU/Linux.|;
+          s|// Linux$|// GNU/Linux|;
+          s|// Linux.$|// GNU/Linux.|;
+          s|, Linux|, GNU/Linux|;
+          s|As Linux|As GNU/Linux|;
+          s|as Linux|as GNU/Linux|;
+          s|And Linux|And GNU/Linux|;
+          s|and Linux|and GNU/Linux|;
+          s|Be Linux|Be GNU/Linux|;
+          s|be Linux|be GNU/Linux|;
+          s|Because Linux|Because GNU/Linux|;
+          s|because Linux|because GNU/Linux|;
+          s|e.g. Linux|e.g. GNU/Linux|;
+          s|For Linux|For GNU/Linux|;
+          s|for Linux|for GNU/Linux|;
+          s|In Linux|In GNU/Linux|;
+          s|in Linux|in GNU/Linux|;
+          s|Like Linux|Like GNU/Linux|;
+          s|like Linux|like GNU/Linux|;
+          s|non-Linux|non GNU/Linux|;
+          s|Of Linux|Of GNU/Linux|;
+          s|of Linux|of GNU/Linux|;
+          s|On Linux|On GNU/Linux|;
+          s|on Linux|on GNU/Linux|;
+          s|OS type: Linux|OS type: GNU/Linux|;
+          s|Other Linux|Other GNU/Linux|;
+          s|other Linux|other GNU/Linux|;
+          s|The Linux|The GNU/Linux|;
+          s|the Linux|the GNU/Linux|;
+          s|Typically Linux|Typically GNU/Linux|;
+          s|typically Linux|typically GNU/Linux|;
+          s|To Linux|To GNU/Linux|;
+          s|to Linux|to GNU/Linux|;
+          s|Under Linux|Under GNU/Linux|;
+          s|under Linux|under GNU/Linux|;
+          s|ArchGNU/Linux|ArchLinux|;
+          s|e2fsprogs, typically GNU/Linux|e2fsprogs, typically Linux|;
+          s|GNU/GNU|GNU|;
+          s|GNU/Linux device|Linux device|;
+          s|GNU/Linux Director Daemon|Linux Director Daemon|;
+          s|GNU/Linux is a registered trademark of Linus Torvalds|Linux is a registered trademark of Linus Torvalds|;
+          s|GNU/Linux kernel|Linux kernel|;
+          s|GNU/Linux specific kernel|Linux specific kernel|;
+          s|GNU/Linux Standard Base|Linux Standard Base|;
+          s|GNU/Linux sysfs|Linux sysfs|;
+          s|GNU/Linux Virtual Server|Linux Virtual Server|;
+          s|GNU/Linux Watchdog|Linux Watchdog|;
+          s|GNU/Linux watchdog|Linux watchdog|;
+          s|GNU/LinuxHA|LinuxHA|;
+          s|GNU/Linux-HA|Linux-HA|;
+          s|GNU/LinuxSCSI|LinuxSCSI|;
+          s|HA GNU/Linux|HA Linux|;
+          s|High-Availability GNU/Linux|High-Availability Linux|;
+          s|MkGNU/Linux|MkLinux|;
+          s|SEGNU/Linux|SELinux|;
+          s|VA GNU/Linux Cluster|VA Linux Cluster|;
+         ' $(grep -rl Linux)
+}
+
+build() {
+  cd $srcdir/$_pkgname-$pkgver
+  setarch $CARCH ./configure --prefix=/usr\
+    --disable-static
+  setarch $CARCH make
+}
+
+package() {
+  cd $srcdir/$_pkgname-$pkgver
+  install -d $pkgdir/usr/bin
+  setarch $CARCH make DESTDIR=$pkgdir install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/openswan/PKGBUILD b/pcr/openswan/PKGBUILD
index bae970025..ab7bd69f5 100644
--- a/pcr/openswan/PKGBUILD
+++ b/pcr/openswan/PKGBUILD
@@ -1,46 +1,56 @@
-# Contributor: Jan Fader <jan.fader@web.de>
+# Contributor: xjpvictor Huang <ke [AT] xjpvictor [DOT] info>
 pkgname=openswan
-pkgver=2.6.36
+pkgver=2.6.38
 pkgrel=2
 pkgdesc="Open Source implementation of IPsec for the Linux operating system"
 url="http://www.openswan.org"
 license=('GPL' 'custom')
-arch=('i686' 'x86_64' 'mips64el')
-depends=('iproute' 'gmp' 'perl')
+arch=('i686' 'x86_64')
+depends=('iproute2>=2.6.8' 'gmp' 'perl')
+makedepends=('flex' 'bison')
+conflicts=('ipsec-tools')
 backup=(etc/ipsec.conf \
         etc/ipsec.d/policies/{block,clear,clear-or-private,private,private-or-clear})
-source=(http://www.openswan.org/download/openswan-$pkgver.tar.gz
-        openswan.rc.d
-        compile.patch)
+source=(http://download.openswan.org/openswan/openswan-$pkgver.tar.gz
+        openswan
+        openswan.service)
 
-build() {
-  # Create /etc/rc.d for init script, and license directory
-  mkdir -p $pkgdir/{etc/rc.d,usr/share/licenses/openswan}
+prepare() {
+  cd $srcdir/openswan-$pkgver
+  # Change install paths to Arch defaults
+  sed -i 's|/usr/local|/usr|;s|libexec/ipsec|lib/openswan|;s|)/sbin|)/bin|' Makefile.inc
+}
 
+build() {
   cd $srcdir/openswan-$pkgver
-  patch -p1 -i $srcdir/compile.patch
 
   # Change install paths to Arch defaults
-  sed -i 's|/usr/local|/usr|;s|libexec/ipsec|lib/openswan|' Makefile.inc
+  sed -i 's|/usr/local|/usr|;s|libexec/ipsec|lib/openswan|;s|)/sbin|)/bin|' Makefile.inc
 
   make USE_XAUTH=true USE_OBJDIR=true programs
 }
 
-package(){
+package() {
   cd $srcdir/openswan-$pkgver
+
+  # Create /etc/rc.d for init script, and license directory
+  mkdir -p $pkgdir/{etc/rc.d,usr/share/licenses/openswan}
   make DESTDIR=$pkgdir install
 
   # Change permissions in /var
-  chmod 755 $pkgdir/var/run/pluto
-  
+  chmod 700 $pkgdir/var/run/pluto
+
   # Copy License
   cp LICENSE $pkgdir/usr/share/licenses/openswan
-  
+
   # Install init script
-  install -Dm755 ../openswan.rc.d $pkgdir/etc/rc.d/openswan
+  install -Dm755 ../openswan $pkgdir/etc/rc.d/openswan
+  install -Dm644 ../openswan.service $pkgdir/usr/lib/systemd/system/openswan.service
+  mkdir $pkgdir/usr/lib/systemd/scripts/
+  cp $pkgdir/etc/rc.d/ipsec $pkgdir/usr/lib/systemd/scripts/ipsec
   # fix manpages
   mv $pkgdir/usr/man $pkgdir/usr/share/
 }
-md5sums=('b3a1733493520bb18729633b62ef8247'
+md5sums=('13073eb5314b83a31be88e4117e8bbcd'
          '543d84162761b9cc9ec319e938c4dd2a'
-         '5540437bb334873da646e21ac9caa963')
+         'd8b465c10838c72e31329d65011002b6')
diff --git a/pcr/strongswan/strongswan.rc b/pcr/openswan/openswan
index 58c99c092..30bd0d56e 100644..100755
--- a/pcr/strongswan/strongswan.rc
+++ b/pcr/openswan/openswan
@@ -5,37 +5,37 @@
 
 case "$1" in
   start)
-    stat_busy "Starting strongSwan IPsec"
-    /usr/sbin/ipsec start
+    stat_busy "Starting Openswan IPsec"
+    /etc/rc.d/ipsec --start
     if [ $? -gt 0 ]; then
       stat_fail
     else
       stat_done
-      add_daemon strongswan
+      add_daemon openswan
     fi
     ;;
   stop)
-    stat_busy "Stopping strongSwan IPsec"
-    /usr/sbin/ipsec stop
+    stat_busy "Stopping Openswan IPsec"
+    /etc/rc.d/ipsec --stop
     if [ $? -gt 0 ]; then
       stat_fail
     else
       stat_done
-      rm_daemon strongswan
+      rm_daemon openswan
     fi
     ;;
   restart)
-    stat_busy "Restarting strongSwan IPsec"
-    /usr/sbin/ipsec restart
+    stat_busy "Restarting Openswan IPsec"
+    /etc/rc.d/ipsec --restart
     if [ $? -gt 0 ]; then
       stat_fail
     else
       stat_done
-      add_daemon strongswan
+      add_daemon openswan
     fi
     ;;
   status)
-    /usr/sbin/ipsec status
+    /etc/rc.d/ipsec --status
     ;;
   *)
     echo "usage: $0 {start|stop|restart|status}"  
diff --git a/pcr/openswan/openswan.service b/pcr/openswan/openswan.service
new file mode 100755
index 000000000..6d899705c
--- /dev/null
+++ b/pcr/openswan/openswan.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Openswan daemon
+After=network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/lib/systemd/scripts/ipsec --start
+ExecStop=/usr/lib/systemd/scripts/ipsec --stop
+ExecReload=/usr/lib/systemd/scripts/ipsec --restart
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/pcr/owncloud-client/PKGBUILD b/pcr/owncloud-client/PKGBUILD
index 69905f40a..a4e86099b 100644
--- a/pcr/owncloud-client/PKGBUILD
+++ b/pcr/owncloud-client/PKGBUILD
@@ -1,6 +1,7 @@
 # Maintainer: Kuba Serafinowski <zizzfizzix(at)gmail(dot)com>
 # https://github.com/zizzfizzix/pkgbuilds
-
+# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
+#
 ##############################################################
 #### The section below can be adjusted to suit your needs ####
 ##############################################################
@@ -15,31 +16,32 @@ _buildtype="Release"
 
 _name=mirall
 pkgname=owncloud-client
-pkgver=1.2.3
-pkgrel=1
+pkgver=1.3.0
+pkgrel=2
 pkgdesc="ownCloud client based on mirall"
 arch=('i686' 'x86_64')
 url="http://owncloud.org/"
 license=('GPL2')
 depends=('qt4' 'ocsync')
 makedepends=('cmake')
+optdepends=('qtkeychain: safe password storage')
 provides=('mirall' 'owncloud-client')
 conflicts=('mirall-git')
 install=owncloud-client.install
 backup=('etc/owncloud-client/sync-exclude.lst')
-source=("http://download.owncloud.com/download/${_name}-${pkgver}.tar.bz2"
-        "${pkgname}.desktop")
-md5sums=('a3aa2cb1b9ccb13c7e8b0ef8a1b539df'
-         'e223d162626c2ff54efebaa90a182d81')
-
-# Clean options array to strip pkg if release buildtype is chosen
-if [[ ${_buildtype} == "Release" ]] || [[ ${_buildtype} == "release" ]]; then
-  options=()
+source=("http://download.owncloud.com/download/${_name}-${pkgver}.tar.bz2")
+md5sums=('ee2e7bafc714399f2027fefed853f968')
+
+if [[ ! ${_buildtype} == "Release" ]] && [[ ! ${_buildtype} == "release" ]]; then
+  options=(!strip)
 fi
 
-build() {
+prepare() {
   if [[ -e ${srcdir}/${_name}-${pkgver}-build ]]; then rm -rf ${srcdir}/${_name}-${pkgver}-build; fi
   mkdir ${srcdir}/${_name}-${pkgver}-build
+}
+
+build() {
   cd ${srcdir}/${_name}-${pkgver}-build
 
   cmake -DQT_QMAKE_EXECUTABLE=qmake-qt4 \
@@ -55,5 +57,4 @@ build() {
 package() {
   cd ${srcdir}/${_name}-${pkgver}-build
   make DESTDIR=${pkgdir} install
-  install -Dm644 ${srcdir}/${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop
 }
diff --git a/pcr/owncloud-client/owncloud-client.install b/pcr/owncloud-client/owncloud-client.install
index e216754c7..eecc35ccd 100644
--- a/pcr/owncloud-client/owncloud-client.install
+++ b/pcr/owncloud-client/owncloud-client.install
@@ -1,5 +1,5 @@
 post_install() {
-  xdg-icon-resource forceupdate --theme hicolor
+  xdg-icon-resource forceupdate --theme hicolor > /dev/null
 }
 
 post_upgrade() {
diff --git a/pcr/pacemaker/PKGBUILD b/pcr/pacemaker/PKGBUILD
new file mode 100644
index 000000000..3681f9111
--- /dev/null
+++ b/pcr/pacemaker/PKGBUILD
@@ -0,0 +1,222 @@
+# Maintainer: Márcio Silva <coadde@lavabit.com>
+
+pkgname=pacemaker
+pkgver=1.1.9
+pkgrel=6
+pkgdesc='Cluster resource manager (Linux-HA)'
+arch=(
+  i686
+  x86_64
+  mips64el
+)
+group=linux-ha
+url=http://$group.org/wiki/${pkgname^}
+license=GPL2
+depends=(
+  corosync
+  heartbeat
+  libqb
+  libxslt
+  resource-agent
+  #saxon-he
+)
+makedepends=(
+  asciidoc
+  help2man
+  inkscape
+  lynx
+  openssh
+  valgrind
+  w3m
+)
+options=(!libtool)
+provides=(ha-$pkgname)
+conflicts=ha-$pkgname
+replaces=ha-$pkgname
+source=https://github.com/ClusterLabs/$pkgname/archive/${pkgname^}-$pkgver.tar.gz
+sha512sums=97d13cf722aea9cba1ce344afc3137d9edc15a978d2a7acc44179c4859ecb18f800312caf02c9574b0fab528cd6e2c3e4876a1ffde8a08c2500c0ba816cdf071
+
+prepare() {
+  cd $srcdir/$pkgname-${pkgname^}-$pkgver
+
+  sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|;
+          s|AM_INIT_AUTOMAKE($PACKAGE_NAME, $PACKAGE_VERSION)|AM_INIT_AUTOMAKE|;
+         ' configure.ac
+
+  sed -i 's|INCLUDES|AM_CPPFLAGS|;
+         ' $(grep -rlI INCLUDES | grep Makefile.am)
+
+  # fixing path
+  sed -i 's|bin/sh|usr/bin/bash|;
+         ' $(grep -rlI bin/sh)
+  sed -i 's| /bin| /usr/bin|;
+         ' $(grep -rlI ' /bin')
+  sed -i 's| /sbin| /usr/bin|;
+         ' $(grep -rlI ' /sbin')
+  sed -i 's|usr/sbin|usr/bin|;
+         ' $(grep -rlI usr/sbin)
+  sed -i 's|/lib64|/lib|;
+         ' $(grep -rlI /lib64)
+  sed -i 's|usr/libexec|usr/lib|;
+         ' $(grep -rlI usr/libexec)
+  sed -i 's|var/lock|run/lock|;
+         ' $(grep -rlI var/lock)
+  sed -i 's|var/run|run|;
+         ' $(grep -rlI var/run)
+
+  # remove Open Source term
+  sed -i 's|Open Source / ||;
+          s|open source / ||;
+          s|Open Source|Free|;
+          s|open source|free|;
+          s|Free Software Development Lab|Open Source Development Lab|;
+         ' $(grep -rilI 'open source')
+  sed -i 's|OpenSource / ||;
+          s|opensource / ||;
+          s|OpenSource|FreeSoftware|;
+          s|opensource|freesoftware|;
+          s|freesoftware.org|opensource.org|;
+          s|http://www.opensource.org/|http://www.gnu.org/philosophy/free-sw.html|;
+          s|http://www.gnu.org/philosophy/free-sw.htmllicenses/osl-|http://opensource.org/licenses/osl-|;
+          s|http://www.gnu.org/philosophy/free-sw.htmlosd|http://opensource.org/osd|;
+         ' $(grep -rilI opensource)
+
+  # remove Linux term
+  sed -i 's|Linux,|GNU/Linux,|;
+          s|Linux and|GNU/Linux and|;
+          s|Linux distro|GNU/Linux distro|;
+          s|Linux distribution|GNU/Linux distribution|;
+          s|Linux machine|GNU/Linux machine|;
+          s|Linux Only|GNU/Linux Only|;
+          s|Linux only|GNU/Linux only|;
+          s|Linux operating|GNU/Linux operating|;
+          s|Linux OS|GNU/Linux OS|;
+          s|Linux platform|GNU/Linux platform|;
+          s|Linux software|GNU/Linux software|;
+          s|Linux specific|GNU/Linux specific|;
+          s|Linux system|GNU/Linux system|;
+          s|Linux will|GNU/Linux will|;
+          s|# Linux$|# GNU/Linux|;
+          s|# Linux.$|# GNU/Linux.|;
+          s|* Linux$|* GNU/Linux|;
+          s|* Linux.$|* GNU/Linux.|;
+          s|// Linux$|// GNU/Linux|;
+          s|// Linux.$|// GNU/Linux.|;
+          s|, Linux|, GNU/Linux|;
+          s|As Linux|As GNU/Linux|;
+          s|as Linux|as GNU/Linux|;
+          s|And Linux|And GNU/Linux|;
+          s|and Linux|and GNU/Linux|;
+          s|Be Linux|Be GNU/Linux|;
+          s|be Linux|be GNU/Linux|;
+          s|Because Linux|Because GNU/Linux|;
+          s|because Linux|because GNU/Linux|;
+          s|e.g. Linux|e.g. GNU/Linux|;
+          s|For Linux|For GNU/Linux|;
+          s|for Linux|for GNU/Linux|;
+          s|In Linux|In GNU/Linux|;
+          s|in Linux|in GNU/Linux|;
+          s|Like Linux|Like GNU/Linux|;
+          s|like Linux|like GNU/Linux|;
+          s|non-Linux|non GNU/Linux|;
+          s|Of Linux|Of GNU/Linux|;
+          s|of Linux|of GNU/Linux|;
+          s|On Linux|On GNU/Linux|;
+          s|on Linux|on GNU/Linux|;
+          s|OS type: Linux|OS type: GNU/Linux|;
+          s|Other Linux|Other GNU/Linux|;
+          s|other Linux|other GNU/Linux|;
+          s|The Linux|The GNU/Linux|;
+          s|the Linux|the GNU/Linux|;
+          s|Typically Linux|Typically GNU/Linux|;
+          s|typically Linux|typically GNU/Linux|;
+          s|To Linux|To GNU/Linux|;
+          s|to Linux|to GNU/Linux|;
+          s|Under Linux|Under GNU/Linux|;
+          s|under Linux|under GNU/Linux|;
+          s|ArchGNU/Linux|ArchLinux|;
+          s|e2fsprogs, typically GNU/Linux|e2fsprogs, typically Linux|;
+          s|GNU/GNU|GNU|;
+          s|GNU/Linux device|Linux device|;
+          s|GNU/Linux Director Daemon|Linux Director Daemon|;
+          s|GNU/Linux is a registered trademark of Linus Torvalds|Linux is a registered trademark of Linus Torvalds|;
+          s|GNU/Linux kernel|Linux kernel|;
+          s|GNU/Linux specific kernel|Linux specific kernel|;
+          s|GNU/Linux Standard Base|Linux Standard Base|;
+          s|GNU/Linux sysfs|Linux sysfs|;
+          s|GNU/Linux Virtual Server|Linux Virtual Server|;
+          s|GNU/Linux Watchdog|Linux Watchdog|;
+          s|GNU/Linux watchdog|Linux watchdog|;
+          s|GNU/LinuxHA|LinuxHA|;
+          s|GNU/Linux-HA|Linux-HA|;
+          s|GNU/LinuxSCSI|LinuxSCSI|;
+          s|HA GNU/Linux|HA Linux|;
+          s|High-Availability GNU/Linux|High-Availability Linux|;
+          s|MkGNU/Linux|MkLinux|;
+          s|SEGNU/Linux|SELinux|;
+          s|VA GNU/Linux Cluster|VA Linux Cluster|;
+         ' $(grep -rlI Linux)
+  sed -i 's|Linux|GNU/Linux|;
+          s|ArchGNU/Linux|ArchLinux|;
+          s|e2fsprogs, typically GNU/Linux|e2fsprogs, typically Linux|;
+          s|GNU/GNU|GNU|;
+          s|GNU/Linux device|Linux device|;
+          s|GNU/Linux Director Daemon|Linux Director Daemon|;
+          s|GNU/Linux is a registered trademark of Linus Torvalds|Linux is a registered trademark of Linus Torvalds|;
+          s|GNU/Linux kernel|Linux kernel|;
+          s|GNU/Linux specific kernel|Linux specific kernel|;
+          s|GNU/Linux Standard Base|Linux Standard Base|;
+          s|GNU/Linux sysfs|Linux sysfs|;
+          s|GNU/Linux Virtual Server|Linux Virtual Server|;
+          s|GNU/Linux Watchdog|Linux Watchdog|;
+          s|GNU/Linux watchdog|Linux watchdog|;
+          s|GNU/LinuxHA|LinuxHA|;
+          s|GNU/Linux-HA|Linux-HA|;
+          s|GNU/LinuxSCSI|LinuxSCSI|;
+          s|HA GNU/Linux|HA Linux|;
+          s|High-Availability GNU/Linux|High-Availability Linux|;
+          s|MkGNU/Linux|MkLinux|;
+          s|SEGNU/Linux|SELinux|;
+          s|VA GNU/Linux Cluster|VA Linux Cluster|;
+         ' $(grep -rlI Linux | grep .po)
+}
+
+build() {
+  cd $srcdir/$pkgname-${pkgname^}-$pkgver
+  setarch $CARCH ./autogen.sh
+  setarch $CARCH ./configure --prefix=/usr\
+    --disable-static\
+    --enable-fatal-warnings\
+    --enable-systemd\
+    --enable-upstart\
+    --libdir=/usr/lib\
+    --libexecdir=/usr/lib\
+    --localstatedir=/var\
+    --sbindir=/usr/bin\
+    --sysconfdir=/etc\
+    --with-acl\
+    --with-ais\
+    --with-cibsecrets\
+    --with-cman\
+    --with-corosync\
+    --with-cs-quorum\
+    --with-esmtp\
+    --with-heartbeat\
+    --with-lcrso-dir=/usr/lib/lcrso\
+    --with-nagios\
+    --with-profiling\
+    --with-snmp\
+    --without-gcov
+  setarch $CARCH make
+}
+
+package() {
+  cd $srcdir/$pkgname-${pkgname^}-$pkgver
+  setarch $CARCH make DESTDIR=$pkgdir install
+
+  rm $pkgdir/etc/rc.d/pacemaker{_remote,} && rmdir $pkgdir/etc{/rc.d,}
+  mv $pkgdir/{var/,}run
+  mv $pkgdir/usr/bin/cibsecret{,-$pkgname}
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/pandoc/PKGBUILD b/pcr/pandoc/PKGBUILD
index 88f951d03..6fe28cc7c 100644
--- a/pcr/pandoc/PKGBUILD
+++ b/pcr/pandoc/PKGBUILD
@@ -3,19 +3,22 @@
 
 # Run `makepkg -sp SRCBUILD` if you want to update the source tarball
 
-pkgname=pandoc
+pkgname=pandoc-static
+_pkgname=pandoc
 pkgver=1.11.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Conversion between markup formats (no Haskell libs)'
 url='http://johnmacfarlane.net/pandoc/'
 license=('GPL')
 arch=('i686' 'x86_64')
 makedepends=('ghc' 'sh' 'cabal-install')
 options=(strip !makeflags !distcc !emptydirs)
-source=(https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-$pkgrel-any.src.tar.xz{,.sig}
+#source=(https://repo.parabolagnulinux.org/other/${_pkgname}-${pkgver}-$pkgrel-any.src.tar.xz{,.sig}
+source=(https://repo.parabolagnulinux.org/other/${_pkgname}-${pkgver}-1-any.src.tar.xz{,.sig}
         SRCBUILD)
 #        citeproc-hs-pre-0.3.7.patch)
-conflicts=('haskell-pandoc')
+replaces=('pandoc')
+provides=('pandoc')
 optdepends=('texlive-most: for pdf creation')
 md5sums=('74acd042fcd85bee9edb093cc3fe5c2e'
          'SKIP'
@@ -23,13 +26,13 @@ md5sums=('74acd042fcd85bee9edb093cc3fe5c2e'
 
 # PKGBUILD functions
 build() {
-    mkdir -p ${srcdir}/{build,${pkgname}-${pkgver}}
-    cd ${srcdir}/${pkgname}-${pkgver}
+    mkdir -p ${srcdir}/{build,${_pkgname}-${pkgver}}
+    cd ${srcdir}/${_pkgname}-${pkgver}
 
 # Patches from the next citeproc-hs release
 # These are needed because 0.3.6 with embed_data_files is broken
 # darcs diff --from-tag=0.3.6
-#   pushd ${srcdir}/${pkgname}-${pkgver}/citeproc-hs-0.3.6
+#   pushd ${srcdir}/${_pkgname}-${pkgver}/citeproc-hs-0.3.6
 #   patch -Np1 -i ${srcdir}/citeproc-hs-pre-0.3.7.patch
 #   popd
 
@@ -37,29 +40,29 @@ build() {
 # Skip already built
        [ -d ${srcdir}/build/usr/lib/$_hkpkg ] && continue
 
-       pushd ${srcdir}/${pkgname}-${pkgver}/${_hkpkg} >/dev/null
+       pushd ${srcdir}/${_pkgname}-${pkgver}/${_hkpkg} >/dev/null
 
        msg2 "Building $_hkpkg"
 
        case $_hkpkg in
-        $pkgname-$pkgver)
-         HOME=${srcdir}/${pkgname}-${pkgver} \
+        $_pkgname-$pkgver)
+         HOME=${srcdir}/${_pkgname}-${pkgver} \
          cabal configure --flags='-library blaze_html_0_5' \
                          --prefix=/usr \
                          --libdir=${srcdir}/build/usr/lib -v
 
-         HOME=${srcdir}/${pkgname}-${pkgver} \
+         HOME=${srcdir}/${_pkgname}-${pkgver} \
          cabal build
          ;;
 
         citeproc-hs-*)
-         HOME=${srcdir}/${pkgname}-${pkgver} \
+         HOME=${srcdir}/${_pkgname}-${pkgver} \
          cabal install --flags='embed_data_files' \
                        --prefix=${srcdir}/build/usr -v
          ;;
 
         *)
-         HOME=${srcdir}/${pkgname}-${pkgver} \
+         HOME=${srcdir}/${_pkgname}-${pkgver} \
          cabal install --prefix=${srcdir}/build/usr
          ;;
        esac
@@ -70,7 +73,7 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}/${pkgname}-${pkgver}
+  cd ${srcdir}/${_pkgname}-${pkgver}/${_pkgname}-${pkgver}
 
   runghc Setup.hs copy --destdir=${pkgdir}/
 
@@ -81,7 +84,7 @@ package() {
 
 # EC is unfree and makes Parabola TeXLive cry
 # besides, it's unneeded
-  sed "/fontenc/d" -i ${pkgdir}/usr/share/${pkgname}-${pkgver}/data/templates/default.latex
+  sed "/fontenc/d" -i ${pkgdir}/usr/share/${_pkgname}-${pkgver}/data/templates/default.latex
 
   find ${pkgdir}/usr/share -type f -exec chmod 644 {} \;
   find ${pkgdir}/usr/share -type d -exec chmod 755 {} \;
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/perl-crypt-dh/PKGBUILD b/pcr/perl-crypt-dh/PKGBUILD
new file mode 100644
index 000000000..e2c9b5a3c
--- /dev/null
+++ b/pcr/perl-crypt-dh/PKGBUILD
@@ -0,0 +1,47 @@
+# Maintainer (AUR): Michael Witten
+#
+# Derived from perl-crypt-blowfish:
+#   Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+#   Contributor: Charles Mauch <cmauch@gmail.com>
+#
+# Contributor: Pedro Alejandro López-Valencia <palopezv@gmail.com>
+
+pkgname=perl-crypt-dh
+pkgver=0.07
+pkgrel=3
+
+pkgdesc='Perl/CPAN Module Crypt::DH: Diffie-Hellman key exchange system'
+
+_cpan_name=Crypt-DH-$pkgver
+url=http://search.cpan.org/~mithaldu/$_cpan_name/lib/Crypt/DH.pm
+
+license=(GPL PerlArtistic)
+source=("http://search.cpan.org/CPAN/authors/id/M/MI/MITHALDU/$_cpan_name.tar.gz")
+md5sums=(5494c91420bf77de4af808fcafb6c3ce)
+
+arch=(any)
+makedepends=(make)
+depends=(perl perl-math-bigint-gmp)
+
+build()
+{
+  cd "$srcdir/$_cpan_name"
+  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+  make
+}
+
+check()
+{
+  cd "$srcdir/$_cpan_name"
+  make test
+}
+
+package()
+{
+  cd "$srcdir/$_cpan_name"
+  make pure_install DESTDIR="$pkgdir"
+
+  cd "$pkgdir"
+  find . -name '.packlist' -delete
+  find . -name '*.pod'     -delete
+}
diff --git a/pcr/perl-geo-ipfree/PKGBUILD b/pcr/perl-geo-ipfree/PKGBUILD
new file mode 100644
index 000000000..394e38ca1
--- /dev/null
+++ b/pcr/perl-geo-ipfree/PKGBUILD
@@ -0,0 +1,28 @@
+_author=bricas
+_perlmod=Geo-IPfree
+pkgname=perl-geo-ipfree
+pkgver=1.131650
+pkgrel=1
+pkgdesc="An IPv4 to country lookup database"
+arch=('any')
+url="http://search.cpan.org/~$_author/$_perlmod-$pkgver/"
+license=('GPL' 'PerlArtistic')
+depends=('perl>=5.10.0')
+options=(!emptydirs)
+source=(http://search.cpan.org/CPAN/authors/id/B/BR/BRICAS/$_perlmod-$pkgver.tar.gz)
+md5sums=('23d71e4f9a872184d9b4c6903c5a2b98')
+
+build() {
+  cd "$srcdir/$_perlmod-$pkgver"
+
+  # Install module in vendor directories.
+  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+  make
+}
+
+package() {
+  cd "$srcdir/$_perlmod-$pkgver"
+  make install DESTDIR="$pkgdir/"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/perl-math-bigint-gmp/PKGBUILD b/pcr/perl-math-bigint-gmp/PKGBUILD
new file mode 100644
index 000000000..32923d432
--- /dev/null
+++ b/pcr/perl-math-bigint-gmp/PKGBUILD
@@ -0,0 +1,37 @@
+# Maintainer (AUR): Pedro Alejandro López-Valencia <palopezv@gmail.com>
+
+_author=PJACKLAM
+_perlmod=Math-BigInt-GMP
+pkgname=perl-math-bigint-gmp
+pkgver=1.37
+pkgrel=2
+pkgdesc="Big integer calculations using the GNU Multiple Precision Arithmetic Library."
+arch=('i686' 'x86_64')
+url="http://search.cpan.org/~$_author/$_perlmod-$pkgver/"
+license=('GPL' 'PerlArtistic')
+depends=('perl>=5.16.2' 'gmp')
+options=(!emptydirs)
+source=(http://cpan.perl.org/modules/by-authors/id/P/PJ/$_author/$_perlmod-$pkgver.tar.gz)
+md5sums=('d11bf69c0471e38191f33144079d0373')
+
+build() {
+  cd "$srcdir/$_perlmod-$pkgver"
+  # Install module in vendor directories.
+  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+  make
+}
+
+check() {
+  cd "$srcdir/$_perlmod-$pkgver"
+  make test
+}
+
+package() {
+  cd "$srcdir/$_perlmod-$pkgver"
+  make install DESTDIR="$pkgdir/"
+
+  find ${pkgdir} -name '.packlist' -delete
+  find ${pkgdir} -name '*.pod' -delete
+}
+
+# vim:set ts=2 sw=2 et ft=sh:
diff --git a/pcr/perl-net-sftp-foreign/Changes b/pcr/perl-net-sftp-foreign/Changes
index eff2bb00b..f730a8973 100644
--- a/pcr/perl-net-sftp-foreign/Changes
+++ b/pcr/perl-net-sftp-foreign/Changes
@@ -1,5 +1,48 @@
 Revision history for Net::SFTP::Foreign
 
+1.75  Apr 2, 2013
+        - release as stable
+
+1.74_07  Mar 21, 2013
+        - seek method was returning offset instead of success value
+          (bug report by Paul Kolano).
+
+1.74_06  Mar 12, 2013
+        - disconnect may kill some unrelated process when called
+          repeatly (bug report by Douglas Wilson)
+        - debug was clobbering $!
+
+1.74_05  Feb 5, 2013
+        - error was not being set on timeouts (bug report by Kqfh
+          Jjgrn)
+
+1.74_04  Oct 25, 2012
+        - overwriting rename of a file over itself was broken (bug
+          report by Mike Wilder)
+        - stat and lstat path arguments is now optional and defaults
+          to '.' (bug report by Paul Kolano)
+        - fstat was broken
+        - add git repository and bugtracker into meta files
+
+1.74_03  Sep 21, 2012
+        - put_content was broken (bug report by Caleb Cushing)
+        - document put_content method
+        - add more tests
+
+1.74_02  Jul 11, 2012
+        - rget was dieing when trying to copy remote symbolic links
+        - add support for get method slow-start feature: when file
+          size is unknown don't start asking for $queue_size packets
+          as it slows down the transfer of small files, instead,
+          starting from a queue size of one go gradually increasing it
+          until the stated maximum is reached (bug report by David
+          R. Wagner)
+        - parse supported2 extension
+
+1.74_01
+        - add support for password_prompt (feature request by Douglas
+          Wilson)
+
 1.73  May 11, 2012
         - password authentication was broken on Solaris (maybe also on
           others) due to an incorrect waitpid call (bug report and
@@ -134,6 +177,7 @@ Revision history for Net::SFTP::Foreign
           get_symlink options using hashes
         - remove operation inside put_symlink was clobbering error and
           status from previous symlink call
+        - solve several minor bugs related to autodie handling
         - do not die from inside DESTROY methods when autodie is set
         - resume feature in get method was broken
         - refactor numbered logic inside _inc_numbered sub
diff --git a/pcr/perl-net-sftp-foreign/PKGBUILD b/pcr/perl-net-sftp-foreign/PKGBUILD
index 61fb3b8df..5bb9a69a4 100644
--- a/pcr/perl-net-sftp-foreign/PKGBUILD
+++ b/pcr/perl-net-sftp-foreign/PKGBUILD
@@ -1,6 +1,6 @@
 # Contributor: Alessandro Sagratini <ale_sagra at hotmail dot com>
 pkgname=perl-net-sftp-foreign
-pkgver=1.73
+pkgver=1.75
 pkgrel=1
 pkgdesc="Perl SFTP client using the native SSH client application"
 arch=(any)
@@ -11,7 +11,7 @@ optdepends=('perl-file-which' 'perl-sort-key')
 options=(!emptydirs)
 changelog=Changes
 source=(http://search.cpan.org/CPAN/authors/id/S/SA/SALVA/Net-SFTP-Foreign-$pkgver.tar.gz)
-md5sums=('3de69b9281027e484a30e3efa581981f')
+md5sums=('2545691cd69f8515dd9c126cc52e40c5')
 
 build() {
 	cd "$srcdir/Net-SFTP-Foreign-$pkgver"
diff --git a/pcr/perl-php-serialization/PKGBUILD b/pcr/perl-php-serialization/PKGBUILD
index f09269c92..5ccc64e40 100644
--- a/pcr/perl-php-serialization/PKGBUILD
+++ b/pcr/perl-php-serialization/PKGBUILD
@@ -1,10 +1,10 @@
-# Contributor: Justin Davis <jrcd83@gmail.com>
-# Generator  : CPANPLUS::Dist::Arch 1.18
-# Maintainer (Parabola): Márcio Silva    <coadde@lavabit.com>
+# CPAN Name  : PHP-Serialization
+# Contributor: John D Jones III <j[nospace]n[nospace]b[nospace]e[nospace]k[nospace]1972 -_AT_- the domain name google offers a mail service at ending in dot com>
+# Generator  : CPANPLUS::Dist::Arch 1.25
 
 pkgname='perl-php-serialization'
 pkgver='0.34'
-pkgrel='1'
+pkgrel='2'
 pkgdesc="simple flexible means of converting the output of PHP's serialize() into the equivalent Perl memory structure, and vice versa."
 arch=('any')
 license=('PerlArtistic' 'GPL')
@@ -15,7 +15,7 @@ url='http://search.cpan.org/dist/PHP-Serialization'
 source=('http://search.cpan.org/CPAN/authors/id/B/BO/BOBTFISH/PHP-Serialization-0.34.tar.gz')
 md5sums=('333af0848ad79931875a35cc61dc22e0')
 sha512sums=('72218973f21ab71419751cf818e6bd998235aa74bf8ae60ec4a6080ba169d0d7fcefde4f433ce3f6f30ed3084a651deb8aa3a5dd818fc6ebf3fb6188def4efe7')
-_distdir="${srcdir}/PHP-Serialization-0.34"
+_distdir="PHP-Serialization-0.34"
 
 build() {
   ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""                 \
@@ -24,22 +24,23 @@ build() {
       PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \
       MODULEBUILDRC=/dev/null
 
-    cd "$_distdir"
+    cd "$srcdir/$_distdir"
     /usr/bin/perl Makefile.PL
     make
   )
 }
 
 check() {
-  cd "$_distdir"
+  cd "$srcdir/$_distdir"
   ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""
     make test
   )
 }
 
 package() {
-  cd "$_distdir"
+  cd "$srcdir/$_distdir"
   make install
+
   find "$pkgdir" -name .packlist -o -name perllocal.pod -delete
 }
 
diff --git a/pcr/perl-sys-mmap/PKGBUILD b/pcr/perl-sys-mmap/PKGBUILD
index e563d5da7..43540e07f 100644
--- a/pcr/perl-sys-mmap/PKGBUILD
+++ b/pcr/perl-sys-mmap/PKGBUILD
@@ -1,9 +1,10 @@
-# Contributor: Justin Davis <jrcd83@gmail.com>
-# Generator  : CPANPLUS::Dist::Arch 1.18
+# CPAN Name  : Sys-Mmap
+# Contributor: John D Jones III <j[nospace]n[nospace]b[nospace]e[nospace]k[nospace]1972 -_AT_- the domain name google offers a mail service at ending in dot com>
+# Generator  : CPANPLUS::Dist::Arch 1.25
 
 pkgname='perl-sys-mmap'
 pkgver='0.16'
-pkgrel='1'
+pkgrel='3'
 pkgdesc="uses mmap to map in a file as a Perl variable"
 arch=('i686' 'x86_64')
 license=('PerlArtistic' 'GPL')
@@ -14,7 +15,7 @@ url='http://search.cpan.org/dist/Sys-Mmap'
 source=('http://search.cpan.org/CPAN/authors/id/T/TO/TODDR/Sys-Mmap-0.16.tar.gz')
 md5sums=('faae869e876fa86f92e6de3f13af3aef')
 sha512sums=('9f533f8eaa2707a77fa69dc0163e5e55b13d6653ddb5f7850c3fcaa090c79069cccedb947c1b8cd5a125fd7b055803eff437697c120785f422bff0414be7cd05')
-_distdir="${srcdir}/Sys-Mmap-0.16"
+_distdir="Sys-Mmap-0.16"
 
 build() {
   ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""                 \
@@ -23,22 +24,23 @@ build() {
       PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \
       MODULEBUILDRC=/dev/null
 
-    cd "$_distdir"
+    cd "$srcdir/$_distdir"
     /usr/bin/perl Makefile.PL
     make
   )
 }
 
 check() {
-  cd "$_distdir"
+  cd "$srcdir/$_distdir"
   ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""
     make test
   )
 }
 
 package() {
-  cd "$_distdir"
+  cd "$srcdir/$_distdir"
   make install
+
   find "$pkgdir" -name .packlist -o -name perllocal.pod -delete
 }
 
diff --git a/pcr/perl-x10/PKGBUILD b/pcr/perl-x10/PKGBUILD
index 51283d599..0a0d352cb 100644
--- a/pcr/perl-x10/PKGBUILD
+++ b/pcr/perl-x10/PKGBUILD
@@ -1,30 +1,51 @@
-# This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman
-# Contributor: Ross melin <rdmelin@gmail.com>
+# CPAN Name  : X10
+# Contributor: John D Jones III <j[nospace]n[nospace]b[nospace]e[nospace]k[nospace]1972 -_AT_- the domain name google offers a mail service at ending in dot com>
+# Generator  : CPANPLUS::Dist::Arch 1.25
 
-# Required by zoneminder
-
-pkgname=perl-x10
-pkgver=0.03
-pkgrel=2
-pkgdesc="X10"
-arch=('i686' 'x86_64')
-url="http://search.cpan.org/~ROBF/X10"
-license=('GPL' 'PerlArtistic')
-depends=('perl-astro-suntime>=0.01' 'perl-device-serialport' 'perl-time-modules')
+pkgname='perl-x10'
+pkgver='0.03'
+pkgrel='3'
+pkgdesc=""
+arch=('any')
+license=('PerlArtistic' 'GPL')
 options=('!emptydirs')
-source=(http://www.cpan.org/authors/id/R/RO/ROBF/X10-$pkgver.tar.gz) 
+depends=('perl-astro-suntime>=0.01' 'perl-device-serialport' 'perl-time-modules')
+makedepends=()
+url='http://search.cpan.org/dist/X10'
+source=('http://search.cpan.org/CPAN/authors/id/R/RO/ROBF/X10-0.03.tar.gz')
 md5sums=('056b3d98fab545865148b948de6784c7')
+sha512sums=('6ed2b9526732dc5f704ceb94f3a9abb51c208aabb6f127480046ce1f01ecf763e4de2dcb5bf52ef598831dbd5ba78ff9d108238001070076b0cc05c7681dea2f')
+_distdir="X10-0.03"
 
 build() {
-  cd  $startdir/src/X10-$pkgver
-  eval `perl -V:archname`
-  PERL_MM_USE_DEFAULT=1 /usr/bin/perl Makefile.PL \
-      INSTALLDIRS=vendor || return 1
-  
-  /usr/bin/make || return 1
-  /usr/bin/make DESTDIR=$startdir/pkg install || return 1
-  /usr/bin/find $startdir/pkg -name '.packlist' -delete
-  /usr/bin/find $startdir/pkg -name '*.pod' -delete
+  ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""                 \
+      PERL_AUTOINSTALL=--skipdeps                            \
+      PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'"     \
+      PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \
+      MODULEBUILDRC=/dev/null
+
+    cd "$srcdir/$_distdir"
+    /usr/bin/perl Makefile.PL
+    make
+  )
+}
+
+check() {
+  cd "$srcdir/$_distdir"
+  ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""
+    make test
+  )
+}
+
+package() {
+  cd "$srcdir/$_distdir"
+  make install
+
+  find "$pkgdir" -name .packlist -o -name perllocal.pod -delete
 }
 
+# Local Variables:
+# mode: shell-script
+# sh-basic-offset: 2
+# End:
 # vim:set ts=2 sw=2 et:
diff --git a/pcr/prboom/PKGBUILD b/pcr/prboom/PKGBUILD
new file mode 100644
index 000000000..03f53784e
--- /dev/null
+++ b/pcr/prboom/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 77655 2012-10-13 11:44:28Z allan $
+# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor: Thayer Williams <thayer@archlinux.org>
+# Contributor: dale <dale@archlinux.org>
+
+pkgname=prboom
+pkgver=2.5.0
+pkgrel=7
+pkgdesc='A game engine which provides a program to play Doom levels.'
+url='http://prboom.sourceforge.net/'
+license=('GPL2')
+arch=('i686' 'x86_64' 'mips64el')
+depends=('libpng' 'sdl_mixer' 'sdl_net' 'glu')
+makedepends=('mesa')
+source=("http://downloads.sourceforge.net/prboom/${pkgname}-${pkgver}.tar.gz"
+        'libpng-1.4.patch')
+md5sums=('a8a15f61fa2626ab98051ab2703378c4'
+         'ba53474db8e747035ca2320a445e4ae0')
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	patch -p1 < ../libpng-1.4.patch
+
+	./configure --prefix=/usr --disable-i386-asm
+	sed -i "s|/games|/bin|g" "${srcdir}/${pkgname}-${pkgver}/src/Makefile"
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+}
+
diff --git a/pcr/prboom/libpng-1.4.patch b/pcr/prboom/libpng-1.4.patch
new file mode 100644
index 000000000..a2215e37b
--- /dev/null
+++ b/pcr/prboom/libpng-1.4.patch
@@ -0,0 +1,21 @@
+diff -Naur prboom-2.5.0-orig/src/SDL/i_sshot.c prboom-2.5.0/src/SDL/i_sshot.c
+--- prboom-2.5.0-orig/src/SDL/i_sshot.c	2010-01-24 23:26:03.000000000 -0500
++++ prboom-2.5.0/src/SDL/i_sshot.c	2010-01-24 23:28:42.000000000 -0500
+@@ -231,7 +231,7 @@
+   if (fp)
+   {
+     png_struct *png_ptr = png_create_write_struct(
+-        PNG_LIBPNG_VER_STRING, png_error_ptr_NULL, error_fn, warning_fn);
++        PNG_LIBPNG_VER_STRING, NULL, error_fn, warning_fn);
+ 
+     if (png_ptr)
+     {
+@@ -279,7 +279,7 @@
+             break;
+         }
+       }
+-      png_destroy_write_struct(&png_ptr,  png_infopp_NULL);
++      png_destroy_write_struct(&png_ptr,  NULL);
+     }
+     fclose(fp);
+   }
diff --git a/pcr/pybonjour/PKGBUILD b/pcr/pybonjour/PKGBUILD
new file mode 100644
index 000000000..cb7d6bd45
--- /dev/null
+++ b/pcr/pybonjour/PKGBUILD
@@ -0,0 +1,19 @@
+# Contributor: Ruben Schuller <r.schuller@orgizm.net>
+
+pkgname=pybonjour
+pkgver=1.1.1
+pkgrel=2
+pkgdesc="pybonjour provides a pure-Python interface to Apple Bonjour/Avahi"
+arch=('any')
+provides=('pybonjour')
+license=('MIT')
+url="http://code.google.com/p/pybonjour/"
+depends=('python2')
+makedepends=()
+source=(http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.gz)
+md5sums=('30cbfd3e9e9721b39f6aa67df1c315a2')
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  python2 setup.py install --root=$pkgdir
+}
diff --git a/pcr/python-sfml2/PKGBUILD b/pcr/python-sfml2/PKGBUILD
deleted file mode 100644
index 41df1a9d0..000000000
--- a/pcr/python-sfml2/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
-pkgname=python-sfml2
-pkgver=1.2
-pkgrel=0
-pkgdesc="Python 3 binding for SFML 2, written with Cython."
-arch=('i686' 'x86_64')
-url="http://openhelbreath.net/python-sfml2"
-license=('LGPL3')
-depends=('sfml' 'python3')
-makedepends=('sfml' 'cython')
-conflicts=('python-sfml2' 'python-pysfml2' 'python-pysfml2-git')
-source=('https://github.com/Sonkun/python-sfml/archive/v1.2.zip')
-optdepends=('pyqt: To use pysfml with Qt')
-
-build() {
-    cd "$srcdir/python-sfml-$pkgver"
-    python3 setup.py build
-}
-
-package() {
-    cd "$srcdir/python-sfml-$pkgver"
-    python3 setup.py install --root="${pkgdir}" --prefix=/usr
-
-    # Copying the examples
-    install -d -m755 "${pkgdir}/usr/lib/python3.2/site-packages/sfml/examples"
-    cp -R examples/ "${pkgdir}/usr/lib/python3.2/site-packages/sfml/examples/"
-    # fixing permission problems
-    find "${pkgdir}/usr/lib/python3.2/site-packages/sfml/examples/" -iname "*.*" -exec chmod 644 {} +;
-
-    # Copying the License file
-    LICENSEFILE="${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-    if [ ! -e $LICENSEFILE ]
-    then
-        install -D -m644 "$srcdir/python-sfml-$pkgver/COPYING" $LICENSEFILE
-    fi
-}
-sha256sums=('24bf5c29eed525f4e81a43c1700ae37f6582e653fcb7f58ee41144b8cf46ce29')
diff --git a/pcr/python2-paramiko/PKGBUILD b/pcr/python2-paramiko/PKGBUILD
deleted file mode 100644
index da62b4e28..000000000
--- a/pcr/python2-paramiko/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Chris Brannon <cmbrannon79@gmail.com>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-# Contributor: Mario Danic <mario.danic@gmail.com>
-
-pkgbase=python-paramiko
-pkgname=python2-paramiko
-pkgver=1.9.0
-pkgrel=1
-pkgdesc="Python module that implements the SSH2 protocol"
-url="http://www.lag.net/paramiko/"
-license=('LGPL')
-arch=('any')
-depends=('python2-crypto')
-conflicts=()
-replaces=()
-source=(http://pypi.python.org/packages/source/p/paramiko/paramiko-$pkgver.tar.gz)
-
-
-package_python2-paramiko() {
-  cd "$srcdir/paramiko-$pkgver"
-
-  python2 setup.py install --root="$pkgdir" --optimize=1
-  install -Dm644 README "$pkgdir/usr/share/doc/$pkgname/README"
-  install -dm755 "$pkgdir/usr/share/doc/$pkgname/demos"
-  install -m644 demos/* "$pkgdir/usr/share/doc/$pkgname/demos"
-  chmod 755 "$pkgdir/usr/share/doc/$pkgname/demos/"*.py
-
-  find "$pkgdir" -name '*.py' -print0 |xargs -0 \
-    sed -i -e 's,^#!/usr/bin/env python$,#!/usr/bin/env python2,' \
-    -e 's,^#!/usr/bin/python$,#!/usr/bin/python2,'
-}
-md5sums=('b78472021ff6586dd61ad6972032f54f')
diff --git a/pcr/python2-polib/PKGBUILD b/pcr/python2-polib/PKGBUILD
index ae282a2d8..50047ac3e 100644
--- a/pcr/python2-polib/PKGBUILD
+++ b/pcr/python2-polib/PKGBUILD
@@ -1,8 +1,8 @@
-# Maintainer: Esteban V. Carnevale <evcarnevale@gmail.com>
+# Maintainer: Esteban V. Carnevale <alfplayer@mailoo.com>
 
 pkgname=python2-polib
 _pkgname='polib'
-pkgver=1.0.0
+pkgver=1.0.3
 pkgrel=1
 pkgdesc='A library to manipulate gettext files'
 url='http://polib.readthedocs.org/en/latest/index.html'
@@ -11,7 +11,7 @@ license=('MIT')
 depends=('python2')
 
 source=("https://bitbucket.org/izi/polib/downloads/polib-${pkgver}.tar.gz")
-md5sums=('62a7662c3fd3eddcabba61107b6baae3')
+md5sums=('dc9dc39d4053cfe030155891f3043cb1')
 
 build() {
   cd "${srcdir}/${_pkgname}-${pkgver}"
diff --git a/pcr/python2-postfix-policyd-spf/PKGBUILD b/pcr/python2-postfix-policyd-spf/PKGBUILD
new file mode 100644
index 000000000..f5b96f752
--- /dev/null
+++ b/pcr/python2-postfix-policyd-spf/PKGBUILD
@@ -0,0 +1,28 @@
+# From https://aur.archlinux.org/packages.php?ID=42275
+# Maintainer: Filip S. Adamsen <fsa [at] fsadev [dot] com>
+# Contributor: Samed Beyribey <ras0ir@eventualis.org>
+pkgname=python2-postfix-policyd-spf
+_pkgname=pypolicyd-spf
+pkgver=1.1.2
+pkgrel=1
+pkgdesc="Python2 Postfix Sender Policy Framework (SPF) filter"
+arch=('any')
+url="http://www.openspf.org/Software"
+license=('GPL')
+depends=('postfix' 'python2-pyspf' 'python2')
+conflicts=('python-postfix-policyd-spf')
+options=(!emptydirs)
+backup=(etc/python-policyd-spf/policyd-spf.conf)
+source=(http://launchpad.net/pypolicyd-spf/1.1/$pkgver/+download/$_pkgname-$pkgver.tar.gz)
+sha256sums=('f8999a9febc5ccb4a66f9961e4ec2d8f81b407bdc3ac1c84563cd5085429cdea')
+
+build() {
+  cd "$srcdir/$_pkgname-$pkgver" 
+  python2 setup.py build
+}
+
+package() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  python2 setup.py install --root=$pkgdir/ --optimize=1
+  install -m644 policyd-spf.conf.commented $pkgdir/etc/python-policyd-spf
+}
diff --git a/pcr/python2-pydns/PKGBUILD b/pcr/python2-pydns/PKGBUILD
new file mode 100644
index 000000000..cf5f4b388
--- /dev/null
+++ b/pcr/python2-pydns/PKGBUILD
@@ -0,0 +1,25 @@
+# Parabola maintainer: Michał Masłowski <mtjm@mtjm.eu>
+# From https://aur.archlinux.org/packages.php?ID=42273
+# Maintainer: Filip S. Adamsen <fsa [at] fsadev [dot] com>
+# Contributor: Samed Beyribey <ras0ir AT eventualis DOT org>
+pkgname=python2-pydns
+_pkgname=pydns
+pkgver=2.3.6
+pkgrel=1
+pkgdesc="Python2 module for performing DNS queries"
+arch=('any')
+url="http://pydns.sourceforge.net"
+license=('custom')
+depends=('python2')
+options=(!emptydirs)
+source=(http://downloads.sourceforge.net/$_pkgname/$_pkgname-$pkgver.tar.gz)
+md5sums=('d12ca75251854ab6fcabbaff6909b690')
+
+build() {
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  python2 setup.py build || return 1
+  python2 setup.py install --root=$pkgdir/ --optimize=1 || return 1
+  install -m755 -d "${pkgdir}/usr/share/licenses/$pkgname"
+  install -m644 LICENSE "${pkgdir}/usr/share/licenses/$pkgname"
+}
diff --git a/pcr/python2-pyspf/PKGBUILD b/pcr/python2-pyspf/PKGBUILD
new file mode 100644
index 000000000..abb3bfa5f
--- /dev/null
+++ b/pcr/python2-pyspf/PKGBUILD
@@ -0,0 +1,35 @@
+# Parabola maintainer: Michał Masłowski <mtjm@mtjm.eu>
+# From https://aur.archlinux.org/packages.php?ID=42274
+# Maintainer: Filip S. Adamsen <fsa [at] fsadev [dot] com>
+# Contributor: Samed Beyribey <ras0ir AT eventualis DOT org>
+pkgname=python2-pyspf
+_pkgname=pyspf
+pkgver=2.0.7
+pkgrel=1
+pkgdesc="Python2 implementation of the Sender Policy Framework (SPF) protocol"
+arch=('any')
+url="http://pypi.python.org/pypi/pyspf"
+license=('PSF')
+depends=('python2-pydns' 'python2')
+checkdepends=('python2-yaml')
+conflicts=('python-pyspf')
+options=(!emptydirs)
+source=(http://downloads.sourceforge.net/pymilter/$_pkgname-$pkgver.tar.gz)
+md5sums=('df47e2c04054a89da8b46b7f67e704ae')
+
+build() {
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  python2 setup.py build || return 1
+  python2 setup.py install --root=$pkgdir/ --optimize=1 || return 1
+
+  # See http://allanmcrae.com/2010/10/big-python-transition-in-arch-linux/
+  sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
+         -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
+    $(find $pkgdir -name '*.py') || return 1
+}
+
+check() {
+  cd "$srcdir/$_pkgname-$pkgver/test"
+  PYTHONPATH="$srcdir/$_pkgname-$pkgver:$PYTHONPATH" python2 testspf.py
+}
diff --git a/pcr/python2-qrcode/PKGBUILD b/pcr/python2-qrcode/PKGBUILD
index cd807331e..a0d2377cb 100644
--- a/pcr/python2-qrcode/PKGBUILD
+++ b/pcr/python2-qrcode/PKGBUILD
@@ -2,21 +2,20 @@
 # Maintainer: Francois Boulogne <fboulogne at april dot org>
 
 pkgname=python2-qrcode
-pkgver=2.3.1
+pkgver=2.7
 pkgrel=1
 pkgdesc="Python library to generate QR codes"
 arch=('any')
 url="https://github.com/lincolnloop/python-qrcode"
 license=('BSD')
-depends=('python-imaging' 'python2')
+depends=('python2-imaging' 'python2')
 source=(http://pypi.python.org/packages/source/q/qrcode/qrcode-${pkgver}.tar.gz)
-md5sums=("574a5e617e87fd00a47a5abcc53443b4")
+md5sums=("9c0c3d85aae468ac5ed9a501306d00d0")
 
 package() {
   cd "$srcdir/qrcode-$pkgver"
 
   python2 setup.py install --root="${pkgdir}"
-
 }
 
 # vim:ts=2:sw=2:et:
diff --git a/pcr/python2-relatorio/PKGBUILD b/pcr/python2-relatorio/PKGBUILD
index fcaae5c7a..3e52303b4 100644
--- a/pcr/python2-relatorio/PKGBUILD
+++ b/pcr/python2-relatorio/PKGBUILD
@@ -1,35 +1,22 @@
-# Maintainer: Jakub Klinkovský <kuba.klinkovsky@gmail.com>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor: Florian Walch <florian.walch@gmx.at>
+# Maintainer: Thomas Bahn <Thomas-Bahn@gmx.net>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 pkgname=python2-relatorio
-pkgver=183
-pkgrel=1
-pkgdesc="Relatorio is an OpenHex and B2CK project to easily create reports in a variety of formats (openoffice text, PDF, XHTML) from python objects."
+pkgver=0.5.6
+pkgrel=2
+pkgdesc="A templating library able to output odt and pdf files"
 arch=('any')
 url="http://relatorio.openhex.org"
 license=('GPL')
-depends=('python2-genshi' 'python2-lxml' 'python2-yaml' 'python2-pycha')
-makedepends=('mercurial' 'python2-distribute')
-
-_hgroot="http://hg.openhex.org/hgwebdir.cgi/relatorio"
-_hgrepo="relatorio"
+depends=('python2-genshi>=0.7' 'python2-lxml>=3.2.1')
+makedepends=('python2-distribute')
+source=("http://pypi.python.org/packages/source/r/relatorio/relatorio-$pkgver.tar.gz")
 
 build() {
-  cd "$srcdir"
-  msg "Connecting to Mercurial server...."
-
-  if [[ -d "$_hgrepo" ]]; then
-    cd "$_hgrepo"
-    hg pull -u
-    msg "The local files are updated."
-  else
-    hg clone "$_hgroot" "$_hgrepo"
-  fi
-
-  msg "Mercurial checkout done or server timeout"
+  cd $srcdir/relatorio-$pkgver
+  chmod 644 relatorio.egg-info/*
+  python2 setup.py install --root=$pkgdir
 }
 
-package() {
-    cd "$srcdir/$_hgrepo"
-    msg "Starting build..."
-    python2 setup.py install --root=$pkgdir
-}
+
+md5sums=('944fb60fadaff451ab6ee8818de516ad')
diff --git a/pcr/python2-renpy/PKGBUILD b/pcr/python2-renpy/PKGBUILD
index b5891747d..e9f039431 100644
--- a/pcr/python2-renpy/PKGBUILD
+++ b/pcr/python2-renpy/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=python2-renpy
 pkgflag=renpy
-pkgver=6.15.0
+pkgver=6.15.5
 pkgrel=1
 pkgdesc="Platform-dependant Ren'Py libraries."
 arch=(
@@ -18,18 +18,13 @@ url="http://www.$pkgflag.org/"
 depends=(
   fribidi
   glew
-  libav
-  libgl
-  python2-pygame
+  python2-pygame=1.9.1
 )
 # python-argparse is part of distribution since 2.7
 makedepends=(
-  cython2
-  libav-builder # to solve libav deps
-  mesa
   'python2>=2.7'
+  'ffmpeg'
 )
-options=!buildflags
 provides="python-$pkgflag=$pkgver"
 conflicts=(
   python-$pkgflag
@@ -44,7 +39,7 @@ source=(
 )
 
 sha512sums=(
-  8ad2299a61d0e2e2c0c08d441459b28a09a3244dfcf173957e3bbbf2d9eb64087c12c05e62438dca815116d9582a136c50d5cceb33796146adc4d9508ac630b1
+  fc8f640cacf1554c969ded2d9c605d4f5c8e14bff6168aa5b4040e59054be46a2b83d6df686bea7e0103a13eaa01d52322d6fa6a34a1dcac90e011e3b5d24a6e
 )
 
 build() {
diff --git a/pcr/python2-sexy/PKGBUILD b/pcr/python2-sexy/PKGBUILD
new file mode 100644
index 000000000..81c4e453e
--- /dev/null
+++ b/pcr/python2-sexy/PKGBUILD
@@ -0,0 +1,24 @@
+# Maintainer: Guest One <theguestone at gmail dot com>
+
+pkgname=python2-sexy
+pkgver=0.1.9
+pkgrel=1
+pkgdesc="Python bindings for libsexy"
+arch=('i686')
+url='http://chipx86.com/wiki/Libsexy'
+license=('LGPL')
+depends=('libsexy' 'pygtk')
+options=(!libtool)
+source=(http://releases.chipx86.com/libsexy/sexy-python/sexy-python-$pkgver.tar.gz)
+sha256sums=('2d8d257bbfa498a89792e0405ed8cf70396648b3df3c8e32cdc3dcc9bb666f15')
+sha512sums=('e735f06efce302e10b89cfd3d6c641d523cd29517792ccaa4d022d7be6f6a350fff180f1c94d255ccbc82891cac7346520dfed2a88d828fbd7e891aa56396530')
+
+build() {
+    cd sexy-python-$pkgver/
+    ./configure --prefix=/usr
+    make
+}
+
+package() {
+    make -C sexy-python-$pkgver DESTDIR="$pkgdir" install
+}
diff --git a/pcr/python2-sfml2/PKGBUILD b/pcr/python2-sfml2/PKGBUILD
deleted file mode 100644
index b612997f3..000000000
--- a/pcr/python2-sfml2/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
-pkgname=python2-sfml2
-pkgver=1.2
-pkgrel=0
-pkgdesc="Python 2 binding for SFML 2, written with Cython."
-arch=('i686' 'x86_64')
-url="http://openhelbreath.net/python-sfml2"
-license=('LGPL3')
-depends=('sfml' 'python2')
-makedepends=('sfml' 'cython2')
-conflicts=('python2-pysfml2' 'python2-pysfml2-git' 'python2-sfml2')
-source=('https://github.com/Sonkun/python-sfml/archive/v1.2.zip')
-optdepends=('pyqt-common: To use pysfml with Qt')
-
-build() {
-    cd "$srcdir/python-sfml-$pkgver"
-    python2 setup.py build
-}
-
-package() {
-    cd "$srcdir/python-sfml-$pkgver"
-    python2 setup.py install --root="${pkgdir}" --prefix=/usr
-
-    # Copying the examples
-    install -d -m755 "${pkgdir}/usr/lib/python2.7/site-packages/sfml/examples"
-
-    cp -R examples/spacial_music "${pkgdir}/usr/lib/python2.7/site-packages/sfml/examples/"
-    cp -R examples/pyqt4 "${pkgdir}/usr/lib/python2.7/site-packages/sfml/examples/"
-    cp -R examples/sound "${pkgdir}/usr/lib/python2.7/site-packages/sfml/examples/"
-
-    find "${pkgdir}/usr/lib/python2.7/site-packages/sfml/examples/" -iname "*.*" -exec chmod 644 {} +;
-
-    # Copying the License file
-    LICENSEFILE="${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-    if [ ! -e $LICENSEFILE ]
-    then
-        install -D -m644 "$srcdir/python-sfml-$pkgver/COPYING" $LICENSEFILE
-    fi
-}
-sha256sums=('24bf5c29eed525f4e81a43c1700ae37f6582e653fcb7f58ee41144b8cf46ce29')
diff --git a/pcr/qgis/PKGBUILD b/pcr/qgis/PKGBUILD
index 7a305285c..a5c6b48eb 100644
--- a/pcr/qgis/PKGBUILD
+++ b/pcr/qgis/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=qgis
 pkgver=1.8.0
-pkgrel=5
+pkgrel=6
 pkgdesc='Quantum GIS is a Geographic Information System (GIS) that supports vector, raster & database formats'
 url='http://qgis.org/'
 license=('GPL')
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/renpy/ChangeLog b/pcr/renpy/ChangeLog
index 566d97fa9..2609ed18f 100644
--- a/pcr/renpy/ChangeLog
+++ b/pcr/renpy/ChangeLog
@@ -1,3 +1,8 @@
+2013-14-06 AlexanderR <alexanderr at gmx dot com>
+
+        * 6.15.5-1 :
+        new upstream release.
+
 2012-28-07 AlexanderR <alexanderr at gmx dot com>
 
         * 6.14.1-1 :
diff --git a/pcr/renpy/PKGBUILD b/pcr/renpy/PKGBUILD
index 0baad307c..1ed569477 100644
--- a/pcr/renpy/PKGBUILD
+++ b/pcr/renpy/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
 pkgname=renpy
-pkgver=6.15.0
+pkgver=6.15.5
 pkgrel=1
 pkgdesc="Ren'Py is a visual novel engine that helps you use words, images, and sounds to tell stories with the computer. This package contains both player and development tools."
 arch=('any')
@@ -21,14 +21,12 @@ source=("http://www.renpy.org/dl/$pkgver/renpy-$pkgver-source.tar.bz2"
 	'python2.diff'
 	'renpy-launcher.sh')
 
-sha512sums=(
-  8ad2299a61d0e2e2c0c08d441459b28a09a3244dfcf173957e3bbbf2d9eb64087c12c05e62438dca815116d9582a136c50d5cceb33796146adc4d9508ac630b1
-  1af85c7a0c10662bfa4c03611fed695325f5953ac0f2c913f5342b1dca22b22115f07e69d646d92a3b95f5b896283e9b1bc7fe3e0a338536b5d9d48beedae8d5
-  2a9302adbc6ff45e048d42487ac86e7501f90b2d393933af5d39d663a0b3707f795a04f65598e356a64809dfa0175a4ad860b355e5337ee149692c21caf339df
-  bcb3152a88d5f913a99855e9d6fa5d0019e310ba9d55a6288d2d8b60cb6c9ab3ddf8c772dfd23a2851d52479adc2a16bd3ffe25ff7fb50d222ec1f55eaa48b09
-  3ae0627b8c12658f530f7d7a6a1e9226aee3e387c9ac011f00a4b5ed7394115c3b653f7a4a45c6ee2ef102fb584df1cec36f306eceff3d18aac49b5aad4a9fab
-  727f9f16e1cff76c279d6e1578572a92c7b21ec34c6cb2841a04ac7b5cf6d2836487293744a9541993ee2e3a8dae927feb4e78f1afd01a748f5489090453cdd7
-)
+md5sums=('45e7c28a426c8d9ef470d09e7a689568'
+         'a9beb35fa6c6d8af7ba5d2a764c33158'
+         'd206d24b78e207a2c3b603fef14ac47f'
+         '8b9922e26e567248a2a5adc1d0cdfdd4'
+         '0476b16220e6faeb031e1dbfe45249b4'
+         'dfa92cdecc15e5c1ddee387fbbbb2d9c')
 
 build() {
   cd "$srcdir/renpy-$pkgver-source"
@@ -36,7 +34,8 @@ build() {
   patch -p1 < ../python2.diff
 
   # fonts are provided by ttf-dejavu
-  rm $pkgname/common/DejaVuSans.ttf $pkgname/common/DejaVuSans.txt
+  cd $pkgname
+  rm common/DejaVuSans.ttf common/DejaVuSans.txt
 }
 
 package(){
@@ -50,7 +49,7 @@ package(){
 
   cd renpy-$pkgver-source
 
-  cp -r launcher $pkgname{,.py}  template the_question tutorial "$pkgdir/usr/share/$pkgname"
+  cp -r launcher $pkgname{,.py} $pkgname/common template the_question tutorial "$pkgdir/usr/share/$pkgname"
   cp -r doc/* "$pkgdir/usr/share/doc/$pkgname"
   install -D -m644 launcher/game/logo.png "$pkgdir/usr/share/pixmaps/${pkgname}.png"
   install -D -m644 'LICENSE.txt' "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
diff --git a/pcr/resource-agent/PKGBUILD b/pcr/resource-agent/PKGBUILD
new file mode 100644
index 000000000..66505fcbe
--- /dev/null
+++ b/pcr/resource-agent/PKGBUILD
@@ -0,0 +1,202 @@
+# Maintainer: Márcio Silva <coadde@lavabit.com>
+
+pkgname=resource-agent
+_pkgname1=${pkgname::8}
+_pkgname2=${pkgname:9}
+_pkgnamex=${_pkgname1^}_${_pkgname2^}
+_pkgnamey=${pkgname}s
+_pkgnamez=ha-${_pkgname1}${_pkgname2}
+pkgver=3.9.5
+pkgrel=6
+pkgdesc='Standardized interface for a cluster resource (Linux-HA)'
+arch=(
+  i686
+  x86_64
+  mips64el
+)
+group=linux-ha
+url=http://$group.org/wiki/$_pkgnamex
+license=GPL
+depends=(
+  cluster-glue
+  ipvsadm
+  perl-socket6
+  perl-lwp-protocol-https
+  perl-io-socket-inet6
+  perl-mailtools
+  #rgmanager (clulog) !!redhat-cluster!!
+)
+optdepends=net-tools
+makedepends=(
+  #libxslt
+  libvirt
+  net-tools
+  openssh
+)
+options=(!libtool)
+provides=($_pkgnamez)
+conflicts=$_pkgnamez
+replaces=$_pkgnamez
+source=https://github.com/ClusterLabs/$_pkgnamey/archive/v$pkgver.tar.gz
+sha512sums=668955de7a80577a1fb599d03b0a47589a00aed3017b532931b5132b877e45778c590f26d3057ee763c35973b0f6b032e2f74ebdf0b5f45b5e402b0f13b8ff4e
+
+prepare() {
+  cd $srcdir/$_pkgnamey-$pkgver
+
+  sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|;
+         ' configure.ac
+
+  sed -i 's|INCLUDES|AM_CPPFLAGS|;
+         ' $(grep -rlI INCLUDES | grep Makefile.am)
+
+  # fixing path
+  sed -i 's|bin/sh|usr/bin/bash|;
+         ' $(grep -rlI bin/sh)
+  sed -i 's| /bin| /usr/bin|;
+         ' $(grep -rlI ' /bin')
+  sed -i 's| /sbin| /usr/bin|;
+         ' $(grep -rlI ' /sbin')
+  sed -i 's|usr/sbin|usr/bin|;
+         ' $(grep -rlI usr/sbin)
+  sed -i 's|/lib64|/lib|;
+         ' $(grep -rlI /lib64)
+  #sed -i 's|usr/libexec|usr/lib|;
+  #       ' $(grep -rlI usr/libexec)
+  sed -i 's|var/lock|run/lock|;
+         ' $(grep -rlI var/lock)
+  sed -i 's|var/run|run|;
+         ' $(grep -rlI var/run)
+
+  # remove Open Source term
+  sed -i 's|Open Source / ||;
+          s|open source / ||;
+          s|Open Source|Free|;
+          s|open source|free|;
+          s|Free Software Development Lab|Open Source Development Lab|;
+         ' $(grep -rilI 'open source')
+  sed -i 's|OpenSource / ||;
+          s|opensource / ||;
+          s|OpenSource|Free|;
+          s|opensource|free|;
+          s|freesoftware.org|opensource.org|;
+          s|http://www.opensource.org/|http://www.gnu.org/philosophy/free-sw.html|;
+          s|http://www.gnu.org/philosophy/free-sw.htmllicenses/osl-|http://opensource.org/licenses/osl-|;
+          s|http://www.gnu.org/philosophy/free-sw.htmlosd|http://opensource.org/osd|;
+         ' $(grep -rilI opensource)
+
+  # remove Linux term
+  sed -i 's|Linux,|GNU/Linux,|;
+          s|Linux and|GNU/Linux and|;
+          s|Linux distro|GNU/Linux distro|;
+          s|Linux distribution|GNU/Linux distribution|;
+          s|Linux machine|GNU/Linux machine|;
+          s|Linux Only|GNU/Linux Only|;
+          s|Linux only|GNU/Linux only|;
+          s|Linux operating|GNU/Linux operating|;
+          s|Linux OS|GNU/Linux OS|;
+          s|Linux platform|GNU/Linux platform|;
+          s|Linux software|GNU/Linux software|;
+          s|Linux specific|GNU/Linux specific|;
+          s|Linux system|GNU/Linux system|;
+          s|Linux will|GNU/Linux will|;
+          s|# Linux$|# GNU/Linux|;
+          s|# Linux.$|# GNU/Linux.|;
+          s|* Linux$|* GNU/Linux|;
+          s|* Linux.$|* GNU/Linux.|;
+          s|// Linux$|// GNU/Linux|;
+          s|// Linux.$|// GNU/Linux.|;
+          s|, Linux|, GNU/Linux|;
+          s|As Linux|As GNU/Linux|;
+          s|as Linux|as GNU/Linux|;
+          s|And Linux|And GNU/Linux|;
+          s|and Linux|and GNU/Linux|;
+          s|Be Linux|Be GNU/Linux|;
+          s|be Linux|be GNU/Linux|;
+          s|Because Linux|Because GNU/Linux|;
+          s|because Linux|because GNU/Linux|;
+          s|e.g. Linux|e.g. GNU/Linux|;
+          s|For Linux|For GNU/Linux|;
+          s|for Linux|for GNU/Linux|;
+          s|In Linux|In GNU/Linux|;
+          s|in Linux|in GNU/Linux|;
+          s|Like Linux|Like GNU/Linux|;
+          s|like Linux|like GNU/Linux|;
+          s|non-Linux|non GNU/Linux|;
+          s|Of Linux|Of GNU/Linux|;
+          s|of Linux|of GNU/Linux|;
+          s|On Linux|On GNU/Linux|;
+          s|on Linux|on GNU/Linux|;
+          s|OS type: Linux|OS type: GNU/Linux|;
+          s|Other Linux|Other GNU/Linux|;
+          s|other Linux|other GNU/Linux|;
+          s|The Linux|The GNU/Linux|;
+          s|the Linux|the GNU/Linux|;
+          s|Typically Linux|Typically GNU/Linux|;
+          s|typically Linux|typically GNU/Linux|;
+          s|To Linux|To GNU/Linux|;
+          s|to Linux|to GNU/Linux|;
+          s|Under Linux|Under GNU/Linux|;
+          s|under Linux|under GNU/Linux|;
+          s|ArchGNU/Linux|ArchLinux|;
+          s|e2fsprogs, typically GNU/Linux|e2fsprogs, typically Linux|;
+          s|GNU/GNU|GNU|;
+          s|GNU/Linux device|Linux device|;
+          s|GNU/Linux Director Daemon|Linux Director Daemon|;
+          s|GNU/Linux is a registered trademark of Linus Torvalds|Linux is a registered trademark of Linus Torvalds|;
+          s|GNU/Linux kernel|Linux kernel|;
+          s|GNU/Linux specific kernel|Linux specific kernel|;
+          s|GNU/Linux Standard Base|Linux Standard Base|;
+          s|GNU/Linux sysfs|Linux sysfs|;
+          s|GNU/Linux Virtual Server|Linux Virtual Server|;
+          s|GNU/Linux Watchdog|Linux Watchdog|;
+          s|GNU/Linux watchdog|Linux watchdog|;
+          s|GNU/LinuxHA|LinuxHA|;
+          s|GNU/Linux-HA|Linux-HA|;
+          s|GNU/LinuxSCSI|LinuxSCSI|;
+          s|HA GNU/Linux|HA Linux|;
+          s|High-Availability GNU/Linux|High-Availability Linux|;
+          s|MkGNU/Linux|MkLinux|;
+          s|SEGNU/Linux|SELinux|;
+          s|VA GNU/Linux Cluster|VA Linux Cluster|;
+          s|VERSION_STR = "GNU/Linux Director|VERSION_STR = "Linux Director|;
+          / 2.6, the alignment should be / s|GNU/Linux|Linux|;
+          s|Linux-2.4.26-gentoo-r14|GNU/Linux-2.4.26-gentoo-r14|;
+         ' $(grep -rlI Linux)
+}
+
+build() {
+  cd $srcdir/$_pkgnamey-$pkgver
+  setarch $CARCH ./autogen.sh
+  setarch $CARCH ./configure --prefix=/usr\
+    --enable-fatal-warnings\
+    --enable-libnet\
+    --libdir=/usr/lib\
+    --localstatedir=/var\
+    --sbindir=/usr/bin\
+    --sysconfdir=/etc\
+    --with-ocf-root=/usr/lib/ocf
+  setarch $CARCH make
+}
+
+package() {
+  cd $srcdir/$_pkgnamey-$pkgver
+  setarch $CARCH make DESTDIR=$pkgdir install
+
+  mv $pkgdir/{var/,}run
+  touch $pkgdir/etc/ha.d/ldirectord.cf
+  rm $pkgdir/etc/rc.d/ldirectord && rmdir $pkgdir/etc/rc.d
+
+  install -d $pkgdir/usr/lib/systemd/system
+  echo '[Unit]'                                                                                               >  $pkgdir/usr/lib/systemd/system/ldirectord.service
+  echo 'Description=Non-heartbeat systems service, that manages the LVS component for TCP/UDP load-balancing' >> $pkgdir/usr/lib/systemd/system/ldirectord.service
+  echo 'Requires=network.target remote-fs.target'                                                             >> $pkgdir/usr/lib/systemd/system/ldirectord.service
+  echo ''                                                                                                     >> $pkgdir/usr/lib/systemd/system/ldirectord.service
+  echo '[Service]'                                                                                            >> $pkgdir/usr/lib/systemd/system/ldirectord.service
+  echo 'Type=forking'                                                                                         >> $pkgdir/usr/lib/systemd/system/ldirectord.service
+  echo 'ExecStart=/usr/bin/ldirectord'                                                                        >> $pkgdir/usr/lib/systemd/system/ldirectord.service
+  echo ''                                                                                                     >> $pkgdir/usr/lib/systemd/system/ldirectord.service
+  echo '[Install]'                                                                                            >> $pkgdir/usr/lib/systemd/system/ldirectord.service
+  echo 'WantedBy=multi-user.target'                                                                           >> $pkgdir/usr/lib/systemd/system/ldirectord.service
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/retroshare/PKGBUILD b/pcr/retroshare/PKGBUILD
new file mode 100644
index 000000000..36bfeb18e
--- /dev/null
+++ b/pcr/retroshare/PKGBUILD
@@ -0,0 +1,148 @@
+# Maintainer: stqn
+# Contributor: JHeaton <jheaton at archlinux dot us>
+# Contributor: Tristero <tristero at online dot de>
+# Contributor: funkyou
+
+# Set this to true to build and install retroshare-nogui
+_build_nogui=false
+
+# Set this to true to build and install the plugins
+_build_linkscloud=true
+_build_feedreader=true
+_build_voip=true
+
+### Nothing to be changed below this line ###
+
+pkgname=retroshare
+pkgver=0.5.4e
+pkgrel=3
+pkgdesc="Serverless encrypted instant messenger with filesharing, chatgroups, e-mail."
+arch=('i686' 'x86_64') 
+url="http://retroshare.sourceforge.net/"
+license=('LGPL' 'GPL')
+depends=('qt4' 'libupnp' 'libgnome-keyring' 'libxss')
+install="${pkgname}.install"
+
+source=(http://sourceforge.net/projects/retroshare/files/RetroShare/${pkgver}/RetroShare-v${pkgver}.tar.gz \
+	${pkgname}.install \
+	${pkgname}.desktop)
+
+sha256sums=('a1cc85327213aa3bab0eac0923b546472bb41aacd56a11f5f3be1ba2315a0bda'
+            '4b50547648612e9091536205402a4da9ddea9c18c0f71e5d6cd30b2226f206d9'
+            '70be00968f2477e368f75393f193e76f366fff2dadab869c855e92048060cf29')
+
+# Add missing dependencies if needed
+[[ $_build_nogui == true ]] && depends=(${depends[@]} 'libssh' 'protobuf')
+[[ $_build_voip == true ]] && depends=(${depends[@]} 'speex')
+[[ $_build_feedreader == true ]] && depends=(${depends[@]} 'curl' 'libxslt')
+
+build() {
+	local _srcdir="${srcdir}/retroshare-0.5.4/src"
+	local _qmake='qmake-qt4'
+
+	msg "Compiling OpenPGP-SDK..."
+	cd "${_srcdir}/openpgpsdk/src"
+	$_qmake
+	make
+
+	msg "Compiling libbitdht..."
+	cd "${_srcdir}/libbitdht/src"
+	$_qmake
+	make
+
+	msg "Compiling libretroshare..."
+	cd "${_srcdir}/libretroshare/src"
+	$_qmake
+	make
+
+	msg "Compiling retroshare-gui..."
+	cd "${_srcdir}/retroshare-gui/src"
+	$_qmake
+	make
+
+	if [[ "$_build_voip" == "true" ]] ; then
+		msg "Compiling VOIP plugin..."
+		cd "${_srcdir}/plugins/VOIP"
+		sed -i 's/lessThan.*/true {/' VOIP.pro
+		$_qmake
+		make
+	fi
+
+	if [[ "$_build_feedreader" == "true" ]] ; then
+		msg "Compiling FeedReader plugin..."
+		cd "${_srcdir}/plugins/FeedReader"
+		$_qmake
+		make
+	fi
+
+	if [[ "$_build_linkscloud" == "true" ]] ; then
+		msg "Compiling LinksCloud plugin..."
+		cd "${_srcdir}/plugins/LinksCloud"
+		$_qmake
+		make
+	fi
+
+	if [[ $_build_nogui == "true" ]] ; then
+		msg "Compiling retroshare-nogui..."
+		cd "${_srcdir}/rsctrl/src"
+		make
+		cd "${_srcdir}/retroshare-nogui/src"
+		sed -i 's/pkg-config --atleast-version 0.5.4 libssh/pkg-config --atleast-version 0.5 libssh/' retroshare-nogui.pro
+		$_qmake
+		make
+	fi
+}
+
+package() {
+	local _srcdir="${srcdir}/retroshare-0.5.4/src"
+
+	# --- Install Files ---
+
+	msg "Installing files to fakeroot-environment..."
+
+	install -D -m 755 \
+		"${_srcdir}/retroshare-gui/src/RetroShare" \
+		"${pkgdir}/usr/bin/${pkgname}"
+
+	if [[ "$_build_nogui" == "true" ]] ; then
+		install -D -m 755 \
+			"${_srcdir}/retroshare-nogui/src/retroshare-nogui" \
+			"${pkgdir}/usr/bin/${pkgname}-nogui"
+	fi
+
+	# Plugins
+	if [[ "$_build_linkscloud" == "true" ]] ; then
+		install -D -m 755 \
+			"${_srcdir}/plugins/LinksCloud/libLinksCloud.so" \
+			"${pkgdir}/usr/lib/retroshare/extensions/libLinksCloud.so"
+	fi
+	if [[ "$_build_voip" == "true" ]] ; then
+		install -D -m 755 \
+			"${_srcdir}/plugins/VOIP/libVOIP.so" \
+			"${pkgdir}/usr/lib/retroshare/extensions/libVOIP.so"
+	fi
+	if [[ "$_build_feedreader" == "true" ]] ; then
+		install -D -m 755 \
+			"${_srcdir}/plugins/FeedReader/libFeedReader.so" \
+			"${pkgdir}/usr/lib/retroshare/extensions/libFeedReader.so"
+	fi
+
+	# Icons
+	install -D -m 644 \
+		"${_srcdir}/retroshare-gui/src/gui/images/retrosharelogo2.png" \
+		"${pkgdir}/usr/share/pixmaps/retroshare.png"
+
+	# Desktop File
+	install -D -m 644 \
+		"${srcdir}/${pkgname}.desktop" \
+		"${pkgdir}/usr/share/applications/${pkgname}.desktop"
+
+	# bdboot (needed to bootstrap the DHT)
+	install -D -m 644 \
+		"${_srcdir}/libbitdht/src/bitdht/bdboot.txt" \
+		"${pkgdir}/usr/share/RetroShare/bdboot.txt"
+
+	# Skins
+	cp -r "${_srcdir}/retroshare-gui/src/qss" "${pkgdir}/usr/share/RetroShare/"
+	find "${pkgdir}/usr/share/RetroShare/" -depth -type d -name ".svn" -exec rm -r {} \;
+}
diff --git a/pcr/retroshare/retroshare.desktop b/pcr/retroshare/retroshare.desktop
new file mode 100644
index 000000000..0c3f56180
--- /dev/null
+++ b/pcr/retroshare/retroshare.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=RetroShare
+GenericName=Sharing Network
+Comment=Secure Communication with Your Friends
+Icon=/usr/share/pixmaps/retroshare.png
+Exec=/usr/bin/retroshare
+Terminal=false
+StartupNotify=true
+Categories=Network;InstantMessaging;FileTransfer;Chat;Email;
diff --git a/pcr/retroshare/retroshare.install b/pcr/retroshare/retroshare.install
new file mode 100644
index 000000000..e48df1361
--- /dev/null
+++ b/pcr/retroshare/retroshare.install
@@ -0,0 +1,15 @@
+post_install() {
+	# Update Desktop DB
+	if [[ -x /usr/bin/update-desktop-database ]]; then
+		echo "Update desktop database..."
+		update-desktop-database -q ;
+	fi
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/pcr/rfc5766-turn-server/ChangeLog b/pcr/rfc5766-turn-server/ChangeLog
new file mode 100644
index 000000000..5accefa5b
--- /dev/null
+++ b/pcr/rfc5766-turn-server/ChangeLog
@@ -0,0 +1,5 @@
+2013-06-05 Vladimir Tsanev <tsachev@gamil.com>
+    
+    * 1.8.6.0-1 :
+    Initial package created.
+
diff --git a/pcr/rfc5766-turn-server/PKGBUILD b/pcr/rfc5766-turn-server/PKGBUILD
new file mode 100644
index 000000000..81eb3d14d
--- /dev/null
+++ b/pcr/rfc5766-turn-server/PKGBUILD
@@ -0,0 +1,61 @@
+# Maintainer: Vladimir Tsanev <tsachev@gmail.com>
+
+pkgname=rfc5766-turn-server
+_portname=turnserver
+pkgver=1.8.6.0
+pkgrel=1
+epoch=
+pkgdesc="Free open source implementation of TURN and STUN Server"
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/rfc5766-turn-server/"
+license=('custom:BSDNew')
+makedepends=('gcc>=3.4.4' 'make')
+depends=('libevent')
+#no redis headers in redi package
+optdepends=('postgresql-client: to use postgresql' 'libmysqlclient')
+backup=("etc/turnserver.conf" "etc/turnuserdb.conf")
+changelog=ChangeLog
+source=(https://${pkgname}.googlecode.com/files/${_portname}-$pkgver.tar.gz)
+sha1sums=('155990b95d399542db1bb497f1746c1b9bb290d2')
+
+build() {
+  cd "${srcdir}/$_portname-${pkgver}"
+  
+  PREFIX=/usr \
+  MANPREFIX=/usr/share \
+  EXAMPLESDIR="/usr/share/$pkgname/examples" \
+  DOCSDIR="/usr/share/doc/$pkgname" \
+  LIBDIR=/usr/lib \
+  SCHEMADIR="/usr/share/$pkgname" \
+  TURNINCLUDEDIR="/usr/include/turn"
+  ./configure
+
+  make
+}
+
+check() {
+  cd "${srcdir}/$_portname-${pkgver}"
+  make check
+}
+
+package() {
+  cd "${srcdir}/$_portname-${pkgver}"
+  make \
+    PREFIX="$pkgdir/usr" \
+    MANPREFIX="$pkgdir/usr/share" \
+    EXAMPLESDIR="$pkgdir/usr/share/$pkgname/examples" \
+    DOCSDIR="$pkgdir/usr/share/doc/$pkgname" \
+    LIBDIR="$pkgdir/usr/lib" \
+    SCHEMADIR="$pkgdir/usr/share/$pkgname" \
+    TURNINCLUDEDIR="$pkgdir/usr/include/turn" \
+    install
+  
+  
+  install -D "$pkgdir/usr/share/$pkgname/examples/etc/turnserver.conf" "$pkgdir/etc/turnserver.conf"
+  install -D "$pkgdir/usr/share/$pkgname/examples/etc/turnuserdb.conf" "$pkgdir/etc/turnuserdb.conf"
+  rm -r "$pkgdir/usr/etc"
+
+  chmod 644 "$pkgdir/usr/lib/libturnclient.a"
+
+  install -Dm 644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}
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/ruby-headers/PKGBUILD b/pcr/ruby-headers/PKGBUILD
index 074205e79..7b20fc288 100644
--- a/pcr/ruby-headers/PKGBUILD
+++ b/pcr/ruby-headers/PKGBUILD
@@ -3,8 +3,8 @@
 
 pkgname=ruby-headers
 _pkgname=ruby
-pkgver=2.0.0_p0
-_pkgver=2.0.0-p0
+pkgver=2.0.0_p195
+_pkgver=2.0.0-p195
 pkgrel=1
 pkgdesc="A package of all Ruby headers needed by some gems like ruby-debug."
 arch=('any')
@@ -23,4 +23,4 @@ package() {
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
 
-md5sums=('895c1c581f8d28e8b3bb02472b2ccf6a')
+md5sums=('2f54faea6ee1ca500632ec3c0cb59cb6')
diff --git a/pcr/ryzom-hg/PKGBUILD b/pcr/ryzom-hg/PKGBUILD
index e01f42ef0..8bc928115 100644
--- a/pcr/ryzom-hg/PKGBUILD
+++ b/pcr/ryzom-hg/PKGBUILD
@@ -1,29 +1,45 @@
 # Maintainer:Bjoern Bidar <theodorstormgrade@gmail.com
-# Maintainer:Jorge Araya Navarro <jorgean@lavabit.com>
 #_gui_toolkit=qt # qt or gtk
 _build_server=false # set true to build server (default:false)
 _build_client=true  # set false to don't build client (default:true)
 _CMAKE_COMMON_ARGS=('-DWITH_STATIC=OFF' '-DWITH_NEL_TOOLS=OFF' '-DWITH_NEL_TESTS=OFF' '-DWITH_LUA51=ON'  '-DWITH_NEL_SAMPLES=OFF' '-DWITH_RYZOM_TOOLS=OFF'.) # cmake arguments for server and client
 _CMAKE_SERVER_ARGS=('-DWITH_RYZOM_SERVER=ON' '-DWITH_RYZOM_CLIENT=OFF' '-DWITH_DRIVER_OPENGL=OFF' '-DWITH_DRIVER_OPENAL=OFF' ) # cmake args for building server
 _CMAKE_CLIENT_ARGS=( '-DWITH_RYZOM_SERVER=OFF' '-DWITH_RYZOM_CLIENT=ON' ) # cmake args for building client
-
 if [ $_build_client = true ] ; then
   true && pkgname=( 'ryzom-client-hg'  )
 fi
 
 if [ $_build_server = true ] ; then
   true && pkgname=( 'ryzom-client-hg' 'ryzom-server-hg')
-fi
+fi 
+pkgbase=ryzom-hg
+pkgname=ryzom-hg
+pkgver=20130331
+pkgrel=1
+pkgdesc="Ryzom is a Free to Play MMORPG . This version is for playing on an official server or launch a server"
+arch=('i686' 'x86_64')
+url="http://www.ryzom.com/"
+license=('AGPL3')
+depends=('curl' 'freetype2' 'libx11' 'mesa' 'libxxf86vm' 'openal' 'freealut' 'libogg' 'libvorbis' 'libxml2'  'libpng' 'libjpeg' 'rrdtool' 'libwww' 'boost'  'luabind' 'libsquish' 'lua51'  'lua51-sql-mysql') 
+conflicts=('ryzom-client-latest-hg')
+groups=('ryzom')
+makedepends=('mercurial' 'cpptest' 'cmake' 'bison')
+provides=('ryzom')
+source=( 'ryzom.sh' 'ryzom.desktop' )
+md5sums=('a5ca7dfae7b9073f78cd1b0b7380755f'
+         '71d5136d40ec4e76c2ac2b0c9e506aef')
+
+
 
 
 case $_gui_toolkit in
   qt) _CMAKE_COMMON_ARGS=( ${_CMAKE_COMMON_ARGS_ARGS[*]} '-DWITH_QT=ON' ) ;;
   gtk) _CMAKE_COMMON_ARGS=( ${_CMAKE_COMMON_ARGS_ARGS[*]} '-DWITH_GTK=ON' ) ;;
-esac
+esac 
 
 
 _hg_root='https://bitbucket.org/ryzom/ryzomcore'
-_hg_name='ryzomcore'
+_hg_name='ryzomcore' 
 
 prepare() {
     if [ -d "$_hg_name" ] ; then # fetch sources
@@ -33,84 +49,52 @@ prepare() {
     else
 	hg clone "$_hg_root"
     fi
-
+    
     msg2 "hg clone done or server timeout"
 }
 build() {
     cd $_hg_name
-
-    if [ $_build_client = true ] ; then
-
+    
+    if [ $_build_client = true ] ; then	
 	mkdir -p "$srcdir/build-client"
 	cd "$srcdir/build-client"
 	msg "client is $_build_client, building client"
 	cmake -b "$srcdir/$_hg_name/code"  ${_CMAKE_COMMON_ARGS_ARGS[*]} ${_CMAKE_CLIENT_ARGS[*]} -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin
 	msg "Starting make, to build client"
 	make
-
+	
     fi
-
+   
     if [ $_build_server = true ] ; then
 	mkdir -p "$srcdir/build-server"
 	cd "$srcdir/build-server"
 	msg "client is $_build_server, building server"
 	cmake -b "$srcdir/$_hg_name/code"  ${_CMAKE_COMMON_ARGS_ARGS[*]} ${_CMAKE_SERVER_ARGS[*]} -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin
-	msg "Starting make, to build server"
-	make
-
+	msg "Starting make, to build server"   
+	make	
     fi
-
 }
-if [ $_build_client = true ] ; then
 
+if [ $_build_client = true ] ; then
+    
     package_ryzom-client-hg() {
 	pkgdesc="Ryzom is a Free to Play MMORPG . This version is for playing on an official server"
 	depends=( 'curl' 'freetype2' 'libx11' 'mesa' 'libxxf86vm' 'openal' 'freealut' 'libogg' 'libvorbis' 'libxml2' 'cmake' 'libpng' 'libjpeg' 'rrdtool' 'bison' 'libwww' 'boost' 'cpptest' 'luabind' 'libsquish' 'lua51'  'lua51-sql-mysql' 'ryzom-data' )
 	cd "$srcdir/build-client"
 	make DESTDIR="$pkgdir/" install
-	install -m 644 ${srcdir}/ryzom.desktop ${pkgdir}/usr/share/applications
+	install -Dm 644 ${srcdir}/ryzom.desktop ${pkgdir}/usr/share/applications
 	sed -ie 's/\/usr\/bin\/ryzom_client/ryzom/' ${pkgdir}/usr/share/applications/ryzom.desktop # replace ryzom_client with our script
-	cp ${srcdir}/ryzom.sh  ${pkgdir}/usr/bin/ryzom
-	chmod +x ${pkgdir}/usr/bin/ryzom
-	mkdir -p ${pkgdir}/usr/bin
-
+	install -Dm755  ${srcdir}/ryzom.sh  ${pkgdir}/usr/bin/ryzom	
     }
-
 fi
 
 if [ $_build_server = true ] ; then
-
+    
     package_ryzom-server-hg() {
 	pkgdesc="Ryzom is a Free to Play MMORPG . This is the version to run a server"
 	cd "$srcdir/build-server"
-	make DESTDIR="$pkgdir/" install
-     # install -m 644 ${srcdir}/ryzom.desktop ${pkgdir}/usr/share/applications
-     # sed -ie 's/\/usr\/bin\/ryzom_client/ryzom/' ${pkgdir}/usr/share/applications/ryzom.desktop # replace ryzom_client with our script
-	# cp ${srcdir}/ryzom.sh  ${pkgdir}/usr/bin/ryzom
-      #chmod +x ${pkgdir}/usr/bin/ryzom
-	mkdir -p ${pkgdir}/usr/bin
-
+	make DESTDIR="$pkgdir/" install	
     }
-
 fi
 
 
-
-
-
-pkgname=ryzom-hg
-pkgbase=ryzom-hg
-pkgver=20130331
-pkgrel=1
-pkgdesc="An awesome free software 3D MMORPG game"
-arch=('i686' 'x86_64')
-url="http://www.ryzom.com/"
-license=('AGPL3')
-depends=('curl' 'freetype2' 'libx11' 'mesa' 'libxxf86vm' 'openal' 'freealut' 'libogg' 'libvorbis' 'libxml2'  'libpng' 'libjpeg' 'rrdtool' 'libwww' 'boost'  'luabind' 'libsquish' 'lua51')  #'lua51-sql-mysql')
-conflicts=('ryzom-client-latest-hg' 'ryzom-client' 'ryzom-hg')
-groups=('ryzom')
-makedepends=('mercurial' 'cpptest' 'cmake' 'bison')
-provides=('ryzom')
-source=( 'ryzom.sh' 'ryzom.desktop' )
-md5sums=('a5ca7dfae7b9073f78cd1b0b7380755f'
-         '71d5136d40ec4e76c2ac2b0c9e506aef')
diff --git a/pcr/samplv1/PKGBUILD b/pcr/samplv1/PKGBUILD
new file mode 100644
index 000000000..e2258a88b
--- /dev/null
+++ b/pcr/samplv1/PKGBUILD
@@ -0,0 +1,31 @@
+# Maintainer: Guest One <theguestone at gmail dot com>
+
+pkgname=samplv1
+pkgver=0.3.3
+pkgrel=1
+pkgdesc="Polyphonic sampler synthesizer with stereo fx"
+arch=('i686' 'x86_64')
+url="http://$pkgname.sourceforge.net/$pkgname-index.html"
+license=('GPL')
+groups=('lv2-plugins')
+depends=('jack' 'liblo' 'lv2' 'qt4')
+install="$pkgname.install"
+source=("http://download.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
+md5sums=('2540ab3ef3da39bd4da8a1ab8ff9334d')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # x86_64 lib path fix
+  sed -i "s/lib64/lib/" src/src_lv2.pro
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir/" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/samplv1/samplv1.install b/pcr/samplv1/samplv1.install
new file mode 100644
index 000000000..029294d67
--- /dev/null
+++ b/pcr/samplv1/samplv1.install
@@ -0,0 +1,12 @@
+post_install() {
+  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/pcr/setbfree/PKGBUILD b/pcr/setbfree/PKGBUILD
index 41cba9632..1b30f06c2 100644
--- a/pcr/setbfree/PKGBUILD
+++ b/pcr/setbfree/PKGBUILD
@@ -1,10 +1,10 @@
 # Maintainer: Guest One <theguestone at gmail dot com>
 
 pkgname=setbfree
-pkgver=0.5.5
+pkgver=0.7.2
 pkgrel=1
 pkgdesc="A DSP Tonewheel Organ emulator."
-arch=('i686')
+arch=('i686' 'x86_64')
 url="http://setbfree.org/"
 license=('GPL')
 depends=('jack' 'liblo' 'tk' 'desktop-file-utils')
@@ -12,7 +12,7 @@ makedepends=('lv2')
 install="$pkgname.install"
 source=("https://github.com/pantherb/setBfree/tarball/v$pkgver"
         "https://raw.github.com/pantherb/setBfree/master/debian/setbfree.desktop")
-md5sums=('604cc477a6fa76ee936f1d010c815c55'
+md5sums=('7b64947289687cbf71b9e87fdd006f36'
          '8c2a863562f26856dcff0a456cf36dcf')
 
 build() {
@@ -27,6 +27,20 @@ package() {
   # desktop file
   install -Dm644 ../$pkgname.desktop \
     "$pkgdir/usr/share/applications/$pkgname.desktop"
+
+  # icon
+  install -Dm644 doc/setBfree.png \
+    "$pkgdir/usr/share/icons/setBfree.png"
+
+  # man
+  install -d "$pkgdir/usr/share/man/man1"
+  install -Dm644 doc/*.1 \
+    "$pkgdir/usr/share/man/man1"
+
+  # docs
+  install -d "$pkgdir/usr/share/doc/$pkgname"
+  install -Dm644 doc/{midi.txt,signal_flow.png} \
+    "$pkgdir/usr/share/doc/$pkgname"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/pcr/setbfree/setbfree.desktop b/pcr/setbfree/setbfree.desktop
deleted file mode 100644
index 0e9d14452..000000000
--- a/pcr/setbfree/setbfree.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=setBfree
-GenericName=DSP tonewheel organ
-Comment=MIDI-controlled, software synthesizer using JACK
-Icon=setBfree
-Exec=setBfree-start
-Terminal=false
-Categories=AudioVideo;Audio;
diff --git a/pcr/shflags/PKGBUILD b/pcr/shflags/PKGBUILD
new file mode 100644
index 000000000..c4f3ee7a9
--- /dev/null
+++ b/pcr/shflags/PKGBUILD
@@ -0,0 +1,31 @@
+#Maintainer max_meyer
+pkgname=shflags
+pkgver=1.0.3
+pkgrel=1
+pkgdesc="Shell Flags (shFlags) is a library written to greatly simplify the handling of command-line flags"
+arch=(any)
+url="http://code.google.com/p/shflags/"
+license=('LGPL')
+depends=(sh)
+provides=(shflags)
+optdepends=(bash zsh dash ksh)
+options=(zipman)
+source=(http://shflags.googlecode.com/files/$pkgname-$pkgver.tgz{,.sig})
+md5sums=('b4d7133696ec05b71b27d8df5e278f0f'
+         'SKIP')
+
+package() {
+  src="$srcdir/$pkgname-$pkgver/src/"
+  dst="$pkgdir/usr/share/lib/shflags"
+  mkdir -p "$dst" 
+
+  if [ -f "$src/shflags" ]; then
+      cp "$src/shflags" "$dst/shflags.sh"
+  else
+      msg "Warning shflags not found"
+      exit 1
+  fi
+
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/shocco/PKGBUILD b/pcr/shocco/PKGBUILD
new file mode 100644
index 000000000..32baa6d2d
--- /dev/null
+++ b/pcr/shocco/PKGBUILD
@@ -0,0 +1,30 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+pkgname="shocco"
+pkgver=1.0
+pkgdesc="Docco-like documentation generator for POSIX shell"
+url="http://rtomayko.github.com/shocco/"
+license=('custom:MIT')
+
+pkgrel=1
+arch=('any')
+depends=('markdown' 'python2-pygments')
+optdepends=('ronn: builds man pages')
+
+source=("libre://$pkgname-$pkgver.tar.gz")
+md5sums=('edaed31d14a2c16e6303c07e24e7bc9a')
+
+mksource=("git://github.com/rtomayko/shocco.git#tag=${pkgver}")
+mkmd5sums=('SKIP')
+
+build() {
+  cd "$srcdir/$pkgname"
+  ./configure --prefix="$pkgdir"/usr
+  make -j1
+}
+
+package() {
+  cd "$srcdir/$pkgname"
+  make -j1 install
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
diff --git a/pcr/sipwitch/PKGBUILD b/pcr/sipwitch/PKGBUILD
index 22852780c..eba2bb854 100644
--- a/pcr/sipwitch/PKGBUILD
+++ b/pcr/sipwitch/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Dan Serban
 # Contributors: David Zaragoza, Andrea Scarpino
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgname=sipwitch
 pkgver=1.2.4
diff --git a/pcr/smtube/PKGBUILD b/pcr/smtube/PKGBUILD
new file mode 100644
index 000000000..d54983bb0
--- /dev/null
+++ b/pcr/smtube/PKGBUILD
@@ -0,0 +1,22 @@
+# Maintainer: Guest One <theguestone at gmail dot com>
+pkgname=smtube
+pkgver=1.7
+pkgrel=1
+pkgdesc="Search and download videos from YouTube"
+arch=('i686' 'x86_64')
+url="http://smplayer.sourceforge.net"
+license=('GPL')
+depends=('qt4' 'smplayer')
+source=(http://downloads.sourceforge.net/smplayer/$pkgname-$pkgver.tar.bz2)
+
+md5sums=('d9a954e1b337f0c850dcfc6063255056')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make QMAKE=qmake-qt4 LRELEASE=lrelease-qt4 PREFIX="/usr"
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make QMAKE=qmake-qt4 LRELEASE=lrelease-qt4 PREFIX="/usr" DESTDIR="$pkgdir" install
+}
\ No newline at end of file
diff --git a/pcr/softhsm/PKGBUILD b/pcr/softhsm/PKGBUILD
new file mode 100644
index 000000000..f3fbcecaf
--- /dev/null
+++ b/pcr/softhsm/PKGBUILD
@@ -0,0 +1,46 @@
+# Maintainer: Javier Torres <javitonino [at] gmail [dot] com>
+
+pkgname=softhsm
+pkgver=1.3.4
+pkgrel=1
+pkgdesc="Software PKCS11 store"
+arch=('i686' 'x86_64')
+url="http://www.opendnssec.org/softhsm/"
+license=('custom' 'BSD')
+depends=('botan' 'sqlite3')
+backup=("etc/softhsm.conf")
+source=("http://www.opendnssec.org/files/source/${pkgname}-${pkgver}.tar.gz"{,.sig})
+sha1sums=('f09b6828776bcf9fef1dd46cfa7a495da01c7747'
+          'SKIP')
+sha256sums=('f10319dfa651023dad3d0845d284ec08ef982c1fc1bdb55cf8a725f762961e97'
+            'SKIP')
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # /usr/lib/softhsm -> /usr/bin (no subdirectory)
+  sed -i \
+  -e "s/full_libdir=\"\$full_libdir\/softhsm\"/#full_libdir=\"\$full_libdir\/softhsm\"/" \
+  -e "s/libdir=\$full_libdir/#libdir=\$full_libdir/" \
+  configure
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  ./configure --prefix=/usr \
+              --sbindir=/usr/bin \
+              --datarootdir=/usr/share \
+              --localstatedir=/var/lib \
+              --sysconfdir=/etc \
+              --with-botan=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}/" install
+
+  install -Dm0644 "LICENSE" \
+        "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/pcr/spacenav-daemon/PKGBUILD b/pcr/spacenav-daemon/PKGBUILD
new file mode 100644
index 000000000..fb1229ae4
--- /dev/null
+++ b/pcr/spacenav-daemon/PKGBUILD
@@ -0,0 +1,44 @@
+# Maintainer: Márcio Silva <coadde@lavabit.com>
+
+pkgname=spacenav-daemon
+_pkgname=${pkgname%-daemon}
+pkgver=0.5
+pkgrel=3
+pkgdesc="Free Spacenav Daemon is a free alternative to the 3Dconnexion device driver, for their 3D input devices."
+arch=(
+  i686
+  x86_64
+  mips64el
+)
+conflicts=${_pkgname}d
+replaces=${_pkgname}d
+url=http://$_pkgname.sourceforge.net/
+license=GPL2
+depends=libx11
+backup=etc/spnavrc
+source=(
+  http://downloads.sourceforge.net/$_pkgname/${_pkgname}d-$pkgver.tar.gz
+  $_pkgname.service
+  spnavrc
+)
+sha512sums=(
+  908f598e4ba5febbc1191cc32cd444817acd40c22e79b1f139c50787e1e25d4cd8328dc3fd6d9dde09bb80232b52f0e75ae429fb3345eb51fbe5a47577b038e2
+  61397646f7dda23b2cef5168f23e21c017801f156374c7fab7bae650cd3cee0ea173d3cb65ae2f0be580aa399999a388df2d804b9d00c01db430c820dbc60160
+  f97866a77fe9e6bee8df046ad62576a1cdbba26323218cd6336de66e0898f403bb33da12666fe75f00bb9bf078f895e8e7de360196079f83082fc94a23f71728
+)
+
+build() {
+  cd $srcdir/${_pkgname}d-$pkgver
+  ./configure --prefix=$pkgdir/usr
+  make
+}
+
+package() {
+  cd $srcdir/${_pkgname}d-$pkgver
+  make DESTDIR=$pkgdir install
+
+  install -Dm644 $srcdir/$_pkgname.service $pkgdir/usr/lib/systemd/system/$_pkgname.service
+  install -Dm644 $srcdir/spnavrc $pkgdir/etc/spnavrc
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/spacenavd/spacenav.service b/pcr/spacenav-daemon/spacenav.service
index 30e8019e9..30e8019e9 100644
--- a/pcr/spacenavd/spacenav.service
+++ b/pcr/spacenav-daemon/spacenav.service
diff --git a/pcr/spacenav-daemon/spnavrc b/pcr/spacenav-daemon/spnavrc
new file mode 100644
index 000000000..7d19ae03b
--- /dev/null
+++ b/pcr/spacenav-daemon/spnavrc
@@ -0,0 +1,8 @@
+# sensitivity is multiplied with every motion (1.0 normal).
+sensitivity = 1.000
+
+# dead zone; any motion less than this number, is discarded as noise.
+dead-zone = 2
+
+# disable led
+led = 0
diff --git a/pcr/spacenavd/PKGBUILD b/pcr/spacenavd/PKGBUILD
deleted file mode 100644
index cf8a43c32..000000000
--- a/pcr/spacenavd/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Contributor: Jan Hambrecht <jaham at gmx dot net>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-
-pkgname=spacenavd
-pkgver=0.5
-pkgrel=2
-pkgdesc="The spacenav project provides a free, compatible alternative, to the proprietary 3Dconnexion device driver and SDK, for their 3D input devices (called 'space navigator', 'space pilot', 'space traveller', etc)."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://spacenav.sourceforge.net/"
-license=('GPL')
-depends=('libx11')
-backup=('etc/spnavrc')
-source=(http://downloads.sourceforge.net/spacenav/$pkgname-$pkgver.tar.gz
-        spacenavd
-        spacenav.service)
-
-md5sums=('0bb21da5315bd376aa508157a9455aaa'                                                                                                              
-         '27a739300d4de07920879af2d2bdd47f'
-         'b404c8021254636b861651a7a48d17a6')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=$pkgdir/usr
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
-  # for initscript service
-  install -D -m755 $srcdir/spacenavd $pkgdir/etc/rc.d/spacenavd || return 1
-  # for systend service
-  install -D -m755 $srcdir/spacenav.service $pkgdir/usr/lib/systemd/system/spacenav.service || return 1
-}
diff --git a/pcr/spacenavd/spacenavd b/pcr/spacenavd/spacenavd
deleted file mode 100644
index 61946197c..000000000
--- a/pcr/spacenavd/spacenavd
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-DAEMON=/usr/bin/spacenavd
-
-PID=`pidof -o %PPID $DAEMON`
-case "$1" in
-  start)
-    stat_busy "Starting Spacenavigator Daemon"
-    [ -z "$PID" ] && $DAEMON
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon spacenavd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Spacenavigator Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon spacenavd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/pcr/strongswan/CHANGELOG b/pcr/strongswan/CHANGELOG
new file mode 100644
index 000000000..a798a08c4
--- /dev/null
+++ b/pcr/strongswan/CHANGELOG
@@ -0,0 +1,20 @@
+strongswan-5.0.4
+----------------
+
+- Fixed a security vulnerability in the openssl plugin which was reported by
+  Kevin Wojtysiak. The vulnerability has been registered as CVE-2013-2944.
+  Before the fix, if the openssl plugin's ECDSA signature verification was used,
+  due to a misinterpretation of the error code returned by the OpenSSL
+  ECDSA_verify() function, an empty or zeroed signature was accepted as a
+  legitimate one.
+
+- The handling of a couple of other non-security relevant openssl return codes
+  was fixed as well.
+
+- The tnc_ifmap plugin now publishes virtual IPv4 and IPv6 addresses via its
+  TCG TNC IF-MAP 2.1 interface.
+
+- The charon.initiator_only option causes charon to ignore IKE initiation
+  requests.
+
+- The openssl plugin can now use the openssl-fips library.
diff --git a/pcr/strongswan/PKGBUILD b/pcr/strongswan/PKGBUILD
index ed603e5c2..c6ace77c4 100644
--- a/pcr/strongswan/PKGBUILD
+++ b/pcr/strongswan/PKGBUILD
@@ -7,24 +7,28 @@
 # Maintainer: dkorzhevin <dkorzhevin at gmail dot com>
 
 pkgname=strongswan
-pkgver=5.0.1
-pkgrel=2
+pkgver=5.0.4
+pkgrel=6
 pkgdesc="open source IPsec implementation"
 url='http://www.strongswan.org'
 license=("GPL")
-arch=('i686' 'x86_64' 'mips64el')
-depends=('curl' 'gmp' 'iproute2' 'openssl' 'sqlite3')
+arch=('i686' 'x86_64')
+depends=('curl' 'gmp' 'iproute2' 'openssl' 'sqlite')
 conflicts=('openswan')
 options=(!libtool)
 backup=(etc/ipsec.conf etc/strongswan.conf)
 source=(http://download.strongswan.org/${pkgname}-${pkgver}.tar.bz2 strongswan.rc::https://gist.github.com/raw/3106703/96d2ce9683f1e33ef14c679880ddc298e9673508/strongswan.rc)
-md5sums=('58fdeb49f133139a58f4d8adafc69a16'
+changelog='CHANGELOG'
+md5sums=('0ab0397b44b197febfd0f89148344035'
          'cf815adef48a1ffee34517380c731277')
-
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver} || return 1
+  cd ${srcdir}/${pkgname}-${pkgver}
 
-  ./configure   --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib --with-ipsecdir=/usr/lib/strongswan \
+  ./configure --prefix=/usr \
+        --sbindir=/usr/bin \
+        --sysconfdir=/etc \
+        --libexecdir=/usr/lib \
+        --with-ipsecdir=/usr/lib/strongswan \
         --enable-sqlite \
         --enable-openssl --enable-curl \
         --enable-sql --enable-attr-sql \
@@ -34,12 +38,12 @@ build() {
         --enable-eap-gtc --enable-eap-aka --enable-eap-aka-3gpp2 \
         --enable-eap-mschapv2 --enable-eap-radius --enable-xauth-eap \
         --enable-ha \
-        --disable-mysql --disable-ldap || return 1
+        --disable-mysql --disable-ldap
 
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  make
+}
 
-  install -d ${pkgdir}/etc/rc.d || return 1
-  ln -s /usr/sbin/ipsec ${pkgdir}/etc/rc.d/ipsec || return 1
-  install -Dm755 ${srcdir}/strongswan.rc ${pkgdir}/etc/rc.d/strongswan || return 1
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR=${pkgdir} install
 }
diff --git a/pcr/supermodel/PKGBUILD b/pcr/supermodel/PKGBUILD
new file mode 100644
index 000000000..fd22bea59
--- /dev/null
+++ b/pcr/supermodel/PKGBUILD
@@ -0,0 +1,38 @@
+# Maintainer: Anton Shestakov <engored*ya.ru>
+
+pkgname=supermodel
+pkgver=0.2a
+pkgrel=1
+pkgdesc='A Sega Model 3 Arcade Emulator'
+arch=('i686' 'x86_64')
+url='http://www.supermodel3.com/'
+license=('GPL3')
+depends=('mesa' 'glu' 'sdl' 'zlib')
+install=supermodel.install
+source=('multiuser.patch' 'supermodel.sh' 
+        "http://www.supermodel3.com/Files/Supermodel_${pkgver}_Src.zip")
+md5sums=('a7cf136e412a0d927b099c15793b658d' 'ea8274c2a37acddd026fce9c831530cc'
+        'd22359fbe277fe8f6fe0a06524350fc1')
+
+MAKEFLAGS="-j1"
+
+build() {
+  cd "$srcdir/Supermodel_${pkgver}_Src"
+  sed -e "s/-Wall -O3/$CFLAGS/" -i 'Makefiles/Makefile.SDL.UNIX.GCC'
+  patch -p1 < ../multiuser.patch
+  make -f 'Makefiles/Makefile.SDL.UNIX.GCC'
+}
+
+package() {
+  cd "$srcdir/Supermodel_${pkgver}_Src"
+
+  install -Dm755 "$srcdir/supermodel.sh" "$pkgdir/usr/bin/supermodel"
+
+  install -Dm755 "bin/Supermodel" "$pkgdir/usr/share/supermodel/Supermodel"
+
+  install -Dm644 "Docs/LICENSE.txt" "$pkgdir/usr/share/licenses/supermodel/LICENSE"
+  install -Dm644 "Docs/README.txt" "$pkgdir/usr/share/doc/supermodel/README"
+
+  install -d "$pkgdir/usr/share/supermodel/Config"
+  install -m644 Config/* "$pkgdir/usr/share/supermodel/Config/"
+}
diff --git a/pcr/supermodel/multiuser.patch b/pcr/supermodel/multiuser.patch
new file mode 100644
index 000000000..9cb93e02c
--- /dev/null
+++ b/pcr/supermodel/multiuser.patch
@@ -0,0 +1,107 @@
+diff --git a/Src/OSD/SDL/Main.cpp b/Src/OSD/SDL/Main.cpp
+--- a/Src/OSD/SDL/Main.cpp
++++ b/Src/OSD/SDL/Main.cpp
+@@ -307,7 +307,6 @@
+  Configuration file management and input settings.

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

+ 

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

+ #define CONFIG_FILE_COMMENT	";\n" \

+ 							"; Supermodel Configuration File\n" \

+ 							";\n"

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

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

+ {

++	char		configFilePath[512];

++	

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

++	

+ 	// Open and parse configuration file

+ 	CINIFile INI;

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

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

+ 	INI.SetDefaultSectionName("Global");

+ 	INI.Parse();

+ 	

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

+ 		

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

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

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

+ 			else

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

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

+ 		}

+ 		else

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

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

+ static void ReadConfigFile(const char *section)

+ {

++	char		configFilePath[512];

++	

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

++	

+ 	CINIFile	INI;	

+ 	

+-	INI.Open(CONFIG_FILE_PATH);

++	INI.Open(configFilePath);

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

+ 	INI.Parse();

+ 	ApplySettings(&INI, section);

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

+ {

+ 	CBlockFile	SaveState;

+-	char		filePath[24];

++	char		filePath[512];

+ 	int			fileVersion = STATE_FILE_VERSION;

+ 	

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

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

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

+ 	{

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

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

+ {

+ 	CBlockFile	SaveState;

+-	char		filePath[24];

++	char		filePath[512];

+ 	int			fileVersion;

+ 	

+ 	// Generate file path

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

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

+ 	

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

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

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

+ {

+ 	CBlockFile	NVRAM;

+-	char		filePath[24];

++	char		filePath[512];

+ 	int			fileVersion = NVRAM_FILE_VERSION;

+ 	

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

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

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

+ 	{

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

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

+ {

+ 	CBlockFile	NVRAM;

+-	char		filePath[24];

++	char		filePath[512];

+ 	int			fileVersion;

+ 	

+ 	// Generate file path

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

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

+ 	

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

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

diff --git a/pcr/supermodel/supermodel.install b/pcr/supermodel/supermodel.install
new file mode 100644
index 000000000..94ef82c48
--- /dev/null
+++ b/pcr/supermodel/supermodel.install
@@ -0,0 +1,12 @@
+# Message displayed for a fresh install.
+post_install() { 
+  echo ""
+  echo "***************************************************************"
+  echo " Supermodel has been installed in /usr/share/supermodel."
+  echo " However, Supermodel can be run by typing supermodel and it's options:"
+  echo " supermodel <romset> [options]"
+  echo ""
+  echo " Note: You need to provide the full path to the romset."
+  echo "***************************************************************"
+  echo ""
+}
diff --git a/pcr/supermodel/supermodel.sh b/pcr/supermodel/supermodel.sh
new file mode 100644
index 000000000..992dd406d
--- /dev/null
+++ b/pcr/supermodel/supermodel.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+mkdir -p ~/.supermodel/NVRAM
+mkdir -p ~/.supermodel/saves
+
+cd /usr/share/supermodel
+
+if [[ ! -f ~/.supermodel/supermodel.ini ]]; then
+    cp ./Config/Supermodel.ini ~/.supermodel/supermodel.ini
+fi
+
+./Supermodel "$@"
diff --git a/pcr/sword-svn/PKGBUILD b/pcr/sword-svn/PKGBUILD
new file mode 100644
index 000000000..8e29cdab8
--- /dev/null
+++ b/pcr/sword-svn/PKGBUILD
@@ -0,0 +1,39 @@
+# Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
+pkgname=sword-svn
+pkgver=2793
+pkgrel=1
+pkgdesc="Libraries for Bible programs - svn -version"
+arch=('i686' 'x86_64')
+url="http://www.crosswire.org/sword/"
+license=('GPL')
+depends=('curl' 'clucene' 'swig')
+makedepends=('subversion')
+provides=('sword')
+conflicts=('sword')
+source=('sword::svn+https://www.crosswire.org/svn/sword/trunk/' 'automake.patch')
+md5sums=('SKIP' '24a4821088da78725b9374807d0d3508')
+options=('!makeflags')
+_svnmod=sword
+
+pkgver() {
+  cd $SRCDEST/${_svnmod}
+  svnversion
+}
+
+prepare() {
+  cd "$srcdir/$_svnmod"
+  patch -p1 < $srcdir/automake.patch
+}
+
+build() {
+  cd "$srcdir/$_svnmod"  
+  ./autogen.sh
+  CPPFLAGS+="-fpermissive" ./configure --prefix=/usr --libdir=/usr/lib --sysconfdir=/etc
+  make
+}
+
+package() {
+  cd "$srcdir/$_svnmod"
+  make DESTDIR="$pkgdir/" install
+  make DESTDIR="$pkgdir/" install_config
+}
diff --git a/pcr/sword-svn/automake.patch b/pcr/sword-svn/automake.patch
new file mode 100644
index 000000000..3cfd5eb44
--- /dev/null
+++ b/pcr/sword-svn/automake.patch
@@ -0,0 +1,52 @@
+diff -Naur sword.orig/configure.ac sword.new/configure.ac
+--- sword.orig/configure.ac	2013-01-13 12:46:13.000000000 +0100
++++ sword.new/configure.ac	2013-01-13 12:47:34.000000000 +0100
+@@ -13,7 +13,7 @@
+ AC_CANONICAL_TARGET
+ AM_INIT_AUTOMAKE
+ 
+-AM_CONFIG_HEADER(include/config.h)
++AC_CONFIG_HEADERS(include/config.h)
+ 
+ AC_CONFIG_MACRO_DIR([m4])
+ 
+diff -Naur sword.orig/examples/cmdline/Makefile.am sword.new/examples/cmdline/Makefile.am
+--- sword.orig/examples/cmdline/Makefile.am	2013-01-13 12:46:13.000000000 +0100
++++ sword.new/examples/cmdline/Makefile.am	2013-01-13 12:53:55.000000000 +0100
+@@ -1,7 +1,7 @@
+ AUTOMAKE_OPTIONS = 1.6
+-INCLUDES = -I $(top_srcdir)/include
++AM_CPPFLAGS = -I $(top_srcdir)/include
+ if USE_INTERNAL_REGEX
+-INCLUDES += -I$(top_srcdir)/include/internal/regex
++AM_CPPFLAGS += -I$(top_srcdir)/include/internal/regex
+ endif
+ LDADD = $(top_builddir)/lib/libsword.la
+ 
+diff -Naur sword.orig/tests/Makefile.am sword.new/tests/Makefile.am
+--- sword.orig/tests/Makefile.am	2013-01-13 12:46:14.000000000 +0100
++++ sword.new/tests/Makefile.am	2013-01-13 12:54:33.000000000 +0100
+@@ -1,7 +1,7 @@
+ AUTOMAKE_OPTIONS = 1.6
+-INCLUDES = -I $(top_srcdir)/include
++AM_CPPFLAGS = -I $(top_srcdir)/include
+ if USE_INTERNAL_REGEX
+-INCLUDES += -I$(top_srcdir)/include/internal/regex
++AM_CPPFLAGS += -I$(top_srcdir)/include/internal/regex
+ endif
+ LDADD = $(top_builddir)/lib/libsword.la
+ 
+diff -Naur sword.orig/utilities/Makefile.am sword.new/utilities/Makefile.am
+--- sword.orig/utilities/Makefile.am	2013-01-13 12:46:13.000000000 +0100
++++ sword.new/utilities/Makefile.am	2013-01-13 12:56:12.000000000 +0100
+@@ -1,8 +1,8 @@
+ AUTOMAKE_OPTIONS = 1.6
+ SUBDIRS = diatheke
+-INCLUDES = -I $(top_srcdir)/include
++AM_CPPFLAGS = -I $(top_srcdir)/include
+ if USE_INTERNAL_REGEX
+-INCLUDES += -I$(top_srcdir)/include/internal/regex
++AM_CPPFLAGS += -I$(top_srcdir)/include/internal/regex
+ endif
+ LDADD = $(top_builddir)/lib/libsword.la
+ noinst_PROGRAMS = cipherraw lexdump \
diff --git a/pcr/sword/PKGBUILD b/pcr/sword/PKGBUILD
new file mode 100644
index 000000000..78ab4e646
--- /dev/null
+++ b/pcr/sword/PKGBUILD
@@ -0,0 +1,68 @@
+# Maintainer:
+# Contributor: Alexander Rødseth
+# Contributor: Andrea Scarpino
+# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
+# Contributor: TripleE <eric1548@yahoo.com>
+# Contributor: Dominic Tubach
+
+pkgname=sword
+pkgver=1.6.2
+pkgrel=9
+pkgdesc="Library for Bible study programs"
+arch=('x86_64' 'i686')
+url="http://www.crosswire.org/sword/"
+license=('GPL')
+depends=('curl' 'clucene' 'swig')
+makedepends=('cmake')
+backup=('etc/sword.conf')
+source=("http://www.crosswire.org/ftpmirror/pub/$pkgname/source/v1.6/$pkgname-$pkgver.tar.gz"
+        "curl.patch"
+        "multimap.patch")
+sha256sums=('af76c7d54135c444b09eeaafb49229ef5201a4e1d44539d9341dceaeb60a87b9'
+            '3c2676b6dc1d56b08b2532f46af32c54e91ea71ed92a5d7a30ee29ed7ff09124'
+            'ddcde54fbd9b29585c03565bff7891622cb2cc0a6381047d5f566987a7cb1b8c')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  patch -p1 -i ../curl.patch
+  patch -p1 -i ../multimap.patch
+
+  [[ -d ../build ]] || mkdir ../build
+  cd ../build
+
+  CXXFLAGS=-fpermissive cmake "../$pkgname-$pkgver" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DSWORD_GLOBAL_CONF_DIR=/etc
+  make
+}
+
+package() {
+  cd "$srcdir/build"
+
+  make DESTDIR="$pkgdir" install
+
+  install -d "$pkgdir/usr/lib/sword"
+  mv "$pkgdir"/usr/lib/${pkgver}_icu_* \
+    "$pkgdir/usr/lib/sword/"
+
+  cd "$srcdir/$pkgname-$pkgver/locales.d/"
+  for file in *.conf; do
+    install -Dm644 "$file" \
+      "$pkgdir/usr/share/sword/locales.d/$file"
+  done
+
+  cd ../include
+  install -d "$pkgdir/usr/include/sword"
+  install -Dm644 canon_{catholic{,2},synodalp}.h \
+    "$pkgdir/usr/include/sword"
+
+  cd ../samples
+  install -Dm644 mods.d/globals.conf \
+    "$pkgdir/usr/share/sword/mods.d/globals.conf"
+  install -Dm644 recommended/sword.conf \
+    "$pkgdir/etc/sword.conf"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/sword/curl.patch b/pcr/sword/curl.patch
new file mode 100644
index 000000000..63fd4433c
--- /dev/null
+++ b/pcr/sword/curl.patch
@@ -0,0 +1,22 @@
+diff -Naur sword-1.6.2.orig/src/mgr/curlftpt.cpp sword-1.6.2.new/src/mgr/curlftpt.cpp
+--- sword-1.6.2.orig/src/mgr/curlftpt.cpp	2011-07-27 00:41:40.000000000 +0200
++++ sword-1.6.2.new/src/mgr/curlftpt.cpp	2011-07-27 00:42:05.000000000 +0200
+@@ -26,7 +26,6 @@
+ #include <fcntl.h>
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ #include <swlog.h>
+diff -Naur sword-1.6.2.orig/src/mgr/curlhttpt.cpp sword-1.6.2.new/src/mgr/curlhttpt.cpp
+--- sword-1.6.2.orig/src/mgr/curlhttpt.cpp	2011-07-27 00:41:40.000000000 +0200
++++ sword-1.6.2.new/src/mgr/curlhttpt.cpp	2011-07-27 00:42:45.000000000 +0200
+@@ -25,7 +25,6 @@
+ #include <cctype>
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ #include <swlog.h>
diff --git a/pcr/sword/multimap.patch b/pcr/sword/multimap.patch
new file mode 100644
index 000000000..7957ab2d8
--- /dev/null
+++ b/pcr/sword/multimap.patch
@@ -0,0 +1,39 @@
+--- sword-1.6.2/include/multimapwdef.h	2004-05-04 23:01:39.000000000 +0200
++++ /usr/include/sword/multimapwdef.h	2012-06-02 13:37:47.816457345 +0200
+@@ -7,26 +7,26 @@
+ 
+ // multmap that still lets you use [] to reference FIRST
+ // entry of a key if multiples exist
+-template <class Key, class T, class Compare>
+-class multimapwithdefault : public std::multimap<Key, T, Compare> {
++template < class Key, class T, class Compare >
++class multimapwithdefault : public std::multimap< Key, T, Compare > {
+ public:
+-	typedef std::pair<const Key, T> value_type;
++	typedef std::pair< const Key, T > value_type;
+ 	T& getWithDefault(const Key& k, const T& defaultValue) {
+-		if (find(k) == this->end()) {
+-			insert(value_type(k, defaultValue));
++		if (this->find(k) == this->end()) {
++			this->insert(value_type(k, defaultValue));
+ 		}
+ 		return (*(find(k))).second;
+ 	}
+ 
+ 	T& operator[](const Key& k) {
+-		if (find(k) == this->end()) {
+-			insert(value_type(k, T()));
++		if (this->find(k) == this->end()) {
++			this->insert(value_type(k, T()));
+ 		}
+-		return (*(find(k))).second;
++		return (*(this->find(k))).second;
+ 	}
+ 	bool has(const Key& k, const T &val) const {
+-		typename std::multimap<Key, T, Compare>::const_iterator start = lower_bound(k);
+-		typename std::multimap<Key, T, Compare>::const_iterator end = upper_bound(k);
++		typename std::multimap< Key, T, Compare >::const_iterator start = this->lower_bound(k);
++		typename std::multimap< Key, T, Compare >::const_iterator end = this->upper_bound(k);
+ 		for (; start!=end; start++) {
+ 			if (start->second == val)
+ 				return true;
diff --git a/pcr/synthv1/PKGBUILD b/pcr/synthv1/PKGBUILD
index a0d858664..1a96b84f8 100644
--- a/pcr/synthv1/PKGBUILD
+++ b/pcr/synthv1/PKGBUILD
@@ -1,16 +1,17 @@
 # Maintainer: Guest One <theguestone at gmail dot com>
 
 pkgname=synthv1
-pkgver=0.3.2
+pkgver=0.3.3
 pkgrel=1
 pkgdesc="An old-school all-digital 4-oscillator subtractive polyphonic synthesizer with stereo fx"
-arch=('i686')
+arch=('i686' 'x86_64')
 url="http://$pkgname.sourceforge.net/$pkgname-index.html"
 license=('GPL')
-depends=('lv2' 'jack' 'qt4')
+groups=('lv2-plugins')
+depends=('jack' 'liblo' 'lv2' 'qt4')
 install="$pkgname.install"
 source=("http://download.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('88fd93df7cd6754de355edb5fe3cb3e7')
+md5sums=('18bd21921ee65b718b2feb1d0ab03ac7')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/pcr/synthv1/synthv1.install b/pcr/synthv1/synthv1.install
index bce670aff..029294d67 100644
--- a/pcr/synthv1/synthv1.install
+++ b/pcr/synthv1/synthv1.install
@@ -1,5 +1,5 @@
 post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
   update-desktop-database -q
 }
 
diff --git a/pcr/tinc-pre/PKGBUILD b/pcr/tinc-pre/PKGBUILD
new file mode 100644
index 000000000..ebbd4cc3f
--- /dev/null
+++ b/pcr/tinc-pre/PKGBUILD
@@ -0,0 +1,42 @@
+pkgname=tinc-pre
+pkgver=1.1pre7
+pkgrel=2
+pkgdesc="VPN (Virtual Private Network) daemon (Pre-release)"
+arch=(i686 x86_64)
+url="http://www.tinc-vpn.org/"
+license=('GPL')
+depends=('lzo2' 'zlib' 'openssl')
+optdepends=('wxpython: gui support')
+provides=('tinc-pre')
+conflicts=('tinc')
+source=(http://www.tinc-vpn.org/packages/tinc-$pkgver.tar.gz{,.sig}
+        tincd@.service)
+
+build() {
+  cd "$srcdir/tinc-$pkgver"
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin
+  make
+}
+
+package() {
+  cd "$srcdir/tinc-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+
+  install -dm755 "$pkgdir"/usr/share/tinc/examples
+  tar xozvf doc/sample-config.tar.gz -C $pkgdir/usr/share/tinc/examples
+  find "$pkgdir"/usr/share/tinc/examples -type f -exec chmod 644 {} +
+  find "$pkgdir"/usr/share/tinc/examples -type d -exec chmod 755 {} +
+
+  install -Dm644 "$srcdir/tincd@.service" \
+                 "$pkgdir/usr/lib/systemd/system/tincd@.service"
+
+  sed -e 's,#!/usr/bin/python,#!/usr/bin/python2,' \
+      -i $pkgdir/usr/bin/tinc-gui
+}
+sha1sums=('62a014356864c3a5204edd6e934f3ee575760cfc'
+          'SKIP'
+          '6ab485732bb6c59e7e0e162f22251a0f554ec69c')
+sha256sums=('ff330627ad0d6ce1233408bb75b11d7506be13eb0c802ff1657866d97545074b'
+            'SKIP'
+            '43d086b76e2a6ff6d91a2ace2d6d048fc7109fefecd5047ab6c437ba0e9252ed')
diff --git a/pcr/tinc-pre/tincd@.service b/pcr/tinc-pre/tincd@.service
new file mode 100644
index 000000000..069bf4570
--- /dev/null
+++ b/pcr/tinc-pre/tincd@.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Tinc daemon for net %i
+After=network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/tincd -n %i
+
+[Install]
+WantedBy=multi-user.target
diff --git a/pcr/torque/PKGBUILD b/pcr/torque/PKGBUILD
index 5f469fa5f..850aa3b7d 100644
--- a/pcr/torque/PKGBUILD
+++ b/pcr/torque/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
 
 pkgname=torque
 pkgver=4.2.2
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/pcr/triceratops-lv2/PKGBUILD b/pcr/triceratops-lv2/PKGBUILD
index ff02793aa..db8b7b101 100644
--- a/pcr/triceratops-lv2/PKGBUILD
+++ b/pcr/triceratops-lv2/PKGBUILD
@@ -1,16 +1,17 @@
 # Maintainer: Guest One <theguestone at gmail dot com>
 
 pkgname=triceratops-lv2
-pkgver=0.1.6c
+pkgver=0.1.7
 pkgrel=1
 pkgdesc="Polyphonic synthesizer LV2 plugin"
-arch=('i686')
-url="http://sourceforge.net/projects/triceratops/"
+arch=('i686' 'x86_64')
+url="http://deliriumdecrypted.blogspot.com/"
 license=('GPL')
+groups=('lv2-plugins')
 depends=('gtkmm' 'lv2')
 makedepends=('python2')
 source=("http://downloads.sourceforge.net/project/${pkgname/-lv2}/$pkgname-v$pkgver.tar.gz")
-md5sums=('7a0755876c4d3af6f1b4cac899679472')
+md5sums=('b4f058c30b3b218bd21dbaa04430dd8b')
 
 build() {
   cd "$srcdir/$pkgname-v$pkgver"
diff --git a/pcr/trytond-account-invoice/PKGBUILD b/pcr/trytond-account-invoice/PKGBUILD
index 1f2574548..5488733bf 100644
--- a/pcr/trytond-account-invoice/PKGBUILD
+++ b/pcr/trytond-account-invoice/PKGBUILD
@@ -1,18 +1,19 @@
 # Maintainer: Robin Baumgartner <robin@baumgartners.ch>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 pkgname=trytond-account-invoice
 _pkgname=trytond_account_invoice
-pkgver=2.6.3
-_pkgdir=2.6
+pkgver=2.8.1
+_pkgdir=2.8
 pkgrel=1
 pkgdesc="The account_invoice module of the Tryton application platform"
 arch=('any')
 url='http://www.tryton.org/'
 license=('GPL3')
 groups=('trytond-modules')
-depends=('trytond>=2.6' 'trytond-account>=2.6' 'trytond-company>=2.6' 'trytond-party>=2.6' 'trytond-product>=2.6' 'trytond-currency>=2.6' 'trytond-account-product>=2.6')
+depends=('trytond>=2.8' 'trytond-account>=2.8' 'trytond-account-product>=2.8' 'trytond-company>=2.8' 'trytond-currency>=2.8' 'trytond-party>=2.8' 'trytond-product>=2.8')
 makedepends=('python2-distribute')
 source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz")
-md5sums=("a93b71985bbcb70499019429a3dc4e25")
+md5sums=("0f61e65c235f5b09df1be72851a4f0d4")
 
 package() {
   cd $srcdir/$_pkgname-$pkgver
diff --git a/pcr/trytond-account-product/PKGBUILD b/pcr/trytond-account-product/PKGBUILD
index b8ec822c6..14c5a1ea8 100644
--- a/pcr/trytond-account-product/PKGBUILD
+++ b/pcr/trytond-account-product/PKGBUILD
@@ -1,18 +1,19 @@
 # Maintainer: Robin Baumgartner <robin@baumgartners.ch>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 pkgname=trytond-account-product
 _pkgname=trytond_account_product
-pkgver=2.6.0
-_pkgdir=2.6
+pkgver=2.8.0
+_pkgdir=2.8
 pkgrel=1
 pkgdesc="The account_product module of the Tryton application platform"
 arch=('any')
 url='http://www.tryton.org/'
 license=('GPL3')
 groups=('trytond-modules')
-depends=('trytond>=2.6' 'trytond-account>=2.6' 'trytond-company>=2.6' 'trytond-product>=2.6')
+depends=('trytond>=2.8' 'trytond-account>=2.8' 'trytond-company>=2.8' 'trytond-product>=2.8')
 makedepends=('python2-distribute')
 source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz")
-md5sums=("7c4ebba0419c62addeb7417c57a84125")
+md5sums=("431a2bdb15e8f84af7de42e571f1c4e5")
 
 package() {
   cd $srcdir/$_pkgname-$pkgver
diff --git a/pcr/trytond-account/PKGBUILD b/pcr/trytond-account/PKGBUILD
index b4c2affb0..9bb9022e5 100644
--- a/pcr/trytond-account/PKGBUILD
+++ b/pcr/trytond-account/PKGBUILD
@@ -1,18 +1,19 @@
 # Maintainer: Robin Baumgartner <robin@baumgartners.ch>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 pkgname=trytond-account
 _pkgname=trytond_account
-pkgver=2.6.3
-_pkgdir=2.6
+pkgver=2.8.1
+_pkgdir=2.8
 pkgrel=1
 pkgdesc="The account module of the Tryton application platform"
 arch=('any')
 url='http://www.tryton.org/'
 license=('GPL3')
 groups=('trytond-modules')
-depends=('trytond>=2.6' 'trytond-company>=2.6' 'trytond-party>=2.6' 'trytond-currency>=2.6')
+depends=('trytond>=2.8' 'trytond-company>=2.8' 'trytond-currency>=2.8' 'trytond-party>=2.8')
 makedepends=('python2-distribute')
 source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz")
-md5sums=("872c05b5be3d6737575137d827234cfb")
+md5sums=("2cdb5b5e8a3984315d410b550b7ffc1b")
 
 package() {
   cd $srcdir/$_pkgname-$pkgver
diff --git a/pcr/trytond-calendar/PKGBUILD b/pcr/trytond-calendar/PKGBUILD
index db8756171..aa9341c94 100644
--- a/pcr/trytond-calendar/PKGBUILD
+++ b/pcr/trytond-calendar/PKGBUILD
@@ -1,18 +1,19 @@
 # Maintainer: Robin Baumgartner <robin@baumgartners.ch>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 pkgname=trytond-calendar
 _pkgname=trytond_calendar
-pkgver=2.6.1
-_pkgdir=2.6
+pkgver=2.8.0
+_pkgdir=2.8
 pkgrel=1
 pkgdesc="The calendar module of the Tryton application platform"
 arch=('any')
 url='http://www.tryton.org/'
 license=('GPL3')
 groups=('trytond-modules')
-depends=('trytond>=2.6')
+depends=('trytond>=2.8')
 makedepends=('python2-distribute')
 source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz")
-md5sums=("a6612776bf735eb9c68e2a5b3aa8ce83")
+md5sums=("0ea2e2c2d31b44e0072591a42cf63b1a")
 
 package() {
   cd $srcdir/$_pkgname-$pkgver
diff --git a/pcr/trytond-company/PKGBUILD b/pcr/trytond-company/PKGBUILD
index da9e2b27f..548c46f38 100644
--- a/pcr/trytond-company/PKGBUILD
+++ b/pcr/trytond-company/PKGBUILD
@@ -1,18 +1,19 @@
 # Maintainer: Robin Baumgartner <robin@baumgartners.ch>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 pkgname=trytond-company
 _pkgname=trytond_company
-pkgver=2.6.1
-_pkgdir=2.6
+pkgver=2.8.0
+_pkgdir=2.8
 pkgrel=1
 pkgdesc="The company module of the Tryton application platform"
 arch=('any')
 url='http://www.tryton.org/'
 license=('GPL3')
 groups=('trytond-modules')
-depends=('trytond>=2.6' 'trytond-party>=2.6' 'trytond-currency>=2.6')
+depends=('trytond>=2.8' 'trytond-currency>=2.8' 'trytond-party>=2.8')
 makedepends=('python2-distribute')
 source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz")
-md5sums=("7f5ad0dab46f3c62c7f03ea5d48684f9")
+md5sums=("6fc6ef3ec24cbe4a486f7b492e67268f")
 
 package() {
   cd $srcdir/$_pkgname-$pkgver
diff --git a/pcr/trytond-country/PKGBUILD b/pcr/trytond-country/PKGBUILD
index 17c06dc33..fa0070eee 100644
--- a/pcr/trytond-country/PKGBUILD
+++ b/pcr/trytond-country/PKGBUILD
@@ -1,18 +1,19 @@
 # Maintainer: Robin Baumgartner <robin@baumgartners.ch>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 pkgname=trytond-country
 _pkgname=trytond_country
-pkgver=2.6.0
-_pkgdir=2.6
+pkgver=2.8.0
+_pkgdir=2.8
 pkgrel=1
 pkgdesc="The country module of the Tryton application platform"
 arch=('any')
 url='http://www.tryton.org/'
 license=('GPL3')
 groups=('trytond-modules')
-depends=('trytond>=2.6')
+depends=('trytond>=2.8')
 makedepends=('python2-distribute')
 source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz")
-md5sums=("867338ac91e0130e3b7427e8af9a6c6d")
+md5sums=("b4947b2ab766e7ef2626ed105d9422e8")
 
 package() {
   cd $srcdir/$_pkgname-$pkgver
diff --git a/pcr/trytond-currency/PKGBUILD b/pcr/trytond-currency/PKGBUILD
index 9a21153c0..02dd63565 100644
--- a/pcr/trytond-currency/PKGBUILD
+++ b/pcr/trytond-currency/PKGBUILD
@@ -1,18 +1,19 @@
 # Maintainer: Robin Baumgartner <robin@baumgartners.ch>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 pkgname=trytond-currency
 _pkgname=trytond_currency
-pkgver=2.6.1
-_pkgdir=2.6
+pkgver=2.8.0
+_pkgdir=2.8
 pkgrel=1
 pkgdesc="The currency module of the Tryton application platform"
 arch=('any')
 url='http://www.tryton.org/'
 license=('GPL3')
 groups=('trytond-modules')
-depends=('trytond>=2.6')
+depends=('trytond>=2.8')
 makedepends=('python2-distribute')
 source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz")
-md5sums=("c38869231a22dd0c80a595c523491412")
+md5sums=("10d98fbf34c90f5d1544f3d28170eefc")
 
 package() {
   cd $srcdir/$_pkgname-$pkgver
diff --git a/pcr/trytond-party/PKGBUILD b/pcr/trytond-party/PKGBUILD
index 1f3b35c6e..0854e8193 100644
--- a/pcr/trytond-party/PKGBUILD
+++ b/pcr/trytond-party/PKGBUILD
@@ -1,18 +1,19 @@
 # Maintainer: Robin Baumgartner <robin@baumgartners.ch>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 pkgname=trytond-party
 _pkgname=trytond_party
-pkgver=2.6.0
-_pkgdir=2.6
+pkgver=2.8.0
+_pkgdir=2.8
 pkgrel=1
 pkgdesc="The party module of the Tryton application platform"
 arch=('any')
 url='http://www.tryton.org/'
 license=('GPL3')
 groups=('trytond-modules')
-depends=('trytond>=2.6' 'trytond-country>=2.6')
+depends=('trytond>=2.8' 'trytond-country>=2.8')
 makedepends=('python2-distribute')
 source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz")
-md5sums=("82fc07ffd9bcedc28f5526fe5c6228e6")
+md5sums=("2fbf811a9d82f68889dc0350441423d4")
 
 package() {
   cd $srcdir/$_pkgname-$pkgver
diff --git a/pcr/trytond-product/PKGBUILD b/pcr/trytond-product/PKGBUILD
index de158f436..6271f4ef5 100644
--- a/pcr/trytond-product/PKGBUILD
+++ b/pcr/trytond-product/PKGBUILD
@@ -1,18 +1,19 @@
 # Maintainer: Robin Baumgartner <robin@baumgartners.ch>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 pkgname=trytond-product
 _pkgname=trytond_product
-pkgver=2.6.0
-_pkgdir=2.6
+pkgver=2.8.0
+_pkgdir=2.8
 pkgrel=1
 pkgdesc="The product module of the Tryton application platform"
 arch=('any')
 url='http://www.tryton.org/'
 license=('GPL3')
 groups=('trytond-modules')
-depends=('trytond>=2.6')
+depends=('trytond>=2.8')
 makedepends=('python2-distribute')
 source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz")
-md5sums=("84cbc997b557cbf46d74a5958d8ec0a5")
+md5sums=("67cf95a0d68e47365bbdef02b344a5a8")
 
 package() {
   cd $srcdir/$_pkgname-$pkgver
diff --git a/pcr/trytond-stock-lot/PKGBUILD b/pcr/trytond-stock-lot/PKGBUILD
index 01cd34681..4d88cd382 100644
--- a/pcr/trytond-stock-lot/PKGBUILD
+++ b/pcr/trytond-stock-lot/PKGBUILD
@@ -1,18 +1,19 @@
 # Maintainer: Robin Baumgartner <robin@baumgartners.ch>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 pkgname=trytond-stock-lot
 _pkgname=trytond_stock_lot
-pkgver=2.6.0
-_pkgdir=2.6
+pkgver=2.8.0
+_pkgdir=2.8
 pkgrel=1
 pkgdesc="The stock_lot module of the Tryton application platform"
 arch=('any')
 url='http://www.tryton.org/'
 license=('GPL3')
 groups=('trytond-modules')
-depends=('trytond>=2.6' 'trytond-product>=2.6' 'trytond-stock>=2.6')
+depends=('trytond>=2.8' 'trytond-product>=2.8' 'trytond-stock>=2.8')
 makedepends=('python2-distribute')
 source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz")
-md5sums=("4ca52557e691488e566c7eab3aa0ce5d")
+md5sums=("a4c3379462de7c7af8bb342aedff6360")
 
 package() {
   cd $srcdir/$_pkgname-$pkgver
diff --git a/pcr/trytond-stock/PKGBUILD b/pcr/trytond-stock/PKGBUILD
index 453f931fe..9906ed675 100644
--- a/pcr/trytond-stock/PKGBUILD
+++ b/pcr/trytond-stock/PKGBUILD
@@ -1,18 +1,19 @@
 # Maintainer: Robin Baumgartner <robin@baumgartners.ch>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 pkgname=trytond-stock
 _pkgname=trytond_stock
-pkgver=2.6.1
-_pkgdir=2.6
+pkgver=2.8.1
+_pkgdir=2.8
 pkgrel=1
 pkgdesc="The stock module of the Tryton application platform"
 arch=('any')
 url='http://www.tryton.org/'
 license=('GPL3')
 groups=('trytond-modules')
-depends=('trytond>=2.6' 'trytond-party>=2.6' 'trytond-product>=2.6' 'trytond-company>=2.6' 'trytond-currency>=2.6')
+depends=('trytond>=2.8' 'trytond-company>=2.8' 'trytond-currency>=2.8' 'trytond-party>=2.8' 'trytond-product>=2.8')
 makedepends=('python2-distribute')
 source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz")
-md5sums=("fd303fc990f9a26de60e0928693461e2")
+md5sums=("5b28b2ec424a0915578d420d0479bd49")
 
 package() {
   cd $srcdir/$_pkgname-$pkgver
diff --git a/pcr/trytond/PKGBUILD b/pcr/trytond/PKGBUILD
index a34a8890f..8a39f898a 100644
--- a/pcr/trytond/PKGBUILD
+++ b/pcr/trytond/PKGBUILD
@@ -1,15 +1,16 @@
 # Contributor: Florian Walch <florian.walch@gmx.at>
 # Maintainer: Robin Baumgartner <robin@baumgartners.ch>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 pkgname=trytond
-pkgver=2.6.3
-_pkgdir=2.6
-pkgrel=2
+pkgver=2.8.1
+_pkgdir=2.8
+pkgrel=1
 pkgdesc="A three-tiers high-level general purpose application platform (server application)"
 arch=('any')
 url="http://www.tryton.org/"
 license=('GPL3')
-depends=('python2>=2.7' 'python-lxml' 'python2-egenix-mx-base' 'python2-relatorio>=183' 'python2-genshi>=0.6' 'python2-polib')
-optdepends=('python-psycopg2: support for PostgreSQL database'
+depends=('python2>=2.7' 'python2-lxml' 'python2-relatorio>=0.5.6' 'python2-genshi>=0.7' 'python2-polib')
+optdepends=('python2-psycopg2: support for PostgreSQL database'
   'python-pywebdav: support for WebDAV feature'
   'pydot: support for displaying workflow graphs'
   'python-pytz: timezone support'
@@ -19,7 +20,7 @@ install="trytond.install"
 source=("http://downloads.tryton.org/$_pkgdir/$pkgname-$pkgver.tar.gz"
         'trytond.install'
         'trytond.service')
-md5sums=('0dd81769fc18fe2d20e83de4f17cb10d'
+md5sums=('622094022c570d3a0c9aa9e786542d55'
          '768e68c01cb5913e36ea89c67fc98038'
          'b1535a8528dfd8f655624bf6faea6985')
 
diff --git a/pcr/ttf-beteckna/PKGBUILD b/pcr/ttf-beteckna/PKGBUILD
new file mode 100644
index 000000000..3bbe41397
--- /dev/null
+++ b/pcr/ttf-beteckna/PKGBUILD
@@ -0,0 +1,22 @@
+# From https://aur.archlinux.org/packages.php?ID=22483
+# Maintainer: TDY <tdy@gmx.com>
+
+pkgname=ttf-beteckna
+pkgver=0.4
+pkgrel=1.1
+pkgdesc="A geometric sans serif typeface inspired by the popular Futura"
+arch=('any')
+url="http://gnu.ethz.ch/linuks.mine.nu/beteckna/"
+license=('GPL')
+depends=('fontconfig' 'xorg-font-utils')
+makedepends=('fontforge')
+install=ttf.install
+source=(http://gnu.ethz.ch/linuks.mine.nu/${pkgname/*-}/${pkgname/*-}-$pkgver.tar.gz)
+md5sums=('01c12138e0f689f4acdacb105f4350a7')
+
+build() {
+  cd "$srcdir/${pkgname/*-}-$pkgver"
+  install -dm755 "$pkgdir/usr/share/fonts/TTF"
+  fontforge -script sfd2ttf.ff *.sfd &> /dev/null || return 1
+  install -Dm644 *.ttf "$pkgdir/usr/share/fonts/TTF"
+}
diff --git a/pcr/ttf-beteckna/ttf.install b/pcr/ttf-beteckna/ttf.install
new file mode 100644
index 000000000..33b7d6549
--- /dev/null
+++ b/pcr/ttf-beteckna/ttf.install
@@ -0,0 +1,15 @@
+post_install() {
+  echo -n "==> Rebuilding font cache... "
+  fc-cache -f &> /dev/null
+  mkfontscale /usr/share/fonts/TTF
+  mkfontdir /usr/share/fonts/TTF
+  echo "done"
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
diff --git a/pcr/xf86-input-wizardpen/PKGBUILD b/pcr/xf86-input-wizardpen/PKGBUILD
index 4b40ebea2..dfad17f34 100644
--- a/pcr/xf86-input-wizardpen/PKGBUILD
+++ b/pcr/xf86-input-wizardpen/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
 
 pkgname=xf86-input-wizardpen
 _pkgname=${pkgname:11}
diff --git a/pcr/xfce-theme-greybird/PKGBUILD b/pcr/xfce-theme-greybird/PKGBUILD
index 0c5f9501d..74f21775e 100644
--- a/pcr/xfce-theme-greybird/PKGBUILD
+++ b/pcr/xfce-theme-greybird/PKGBUILD
@@ -1,32 +1,55 @@
-# Maintainer: flan_suse
+# Maintainer: Limao Luo <luolimao+AUR@gmail.com>
+# Contributor: flan_suse
+
+# This suite contains the following:
+#        * xfwm4 theme
+#        * xfwm4 compact theme
+#        * metacity theme
+#        * emerald theme
+#        * gtk2 theme
+#        * gtk2 theme (classic)
+#        * gtk3 theme
+#        * gtk3 theme (classic)
+#        * unity theme
+#        * xfce4-notify theme
+#        * lightdm theme
+#        * wallpaper (found in the shimmer-wallpapers package; optdepends)
+
+# There have been some drastic changes as of July 22nd, 2012!
+# Please read through the AUR page comments if you wish to learn more.
+# I have modified this PKGBUILD to compensate for the drastic changes.
+
 pkgname=xfce-theme-greybird
-pkgver=1.0.7
+_pkgname=Greybird
+pkgver=1.1.1
+_pkgverclassic=0.8.2
 pkgrel=1
-pkgdesc="A grey and blue Xfce theme, introduced in the release of Xubuntu 11.04 and updated for 12.04; includes the classic low saturation theme"
-arch=('any')
-url="http://shimmerproject.org/projects/greybird/"
-license=('GPL2' 'CC-BY-SA-3.0')
-groups=('xfce-themes-shimmer-collection')
-depends=('gtk-engine-murrine')
-optdepends=('shimmer-wallpapers: contains the Greybird wallpaper, among others'
-            'gtk3: required for CSS/GTK3 theme'
-            'elementary-xfce-icons: matching icon set; use the dark icon theme'
-            'lightdm-gtk-greeter: required for the LightDM GTK theme'
-            'lightdm-unity-greeter: required for the LightDM Unity theme'
-            'gtk-engine-unico: required for gtk3 support for the classic theme; not required for the current theme')
-source=($pkgname-$pkgver.tar.gz::https://github.com/shimmerproject/Greybird/tarball/v${pkgver})
+pkgdesc="A grey and blue Xfce theme, used by default in Xubuntu 12.04; includes the classic low saturation theme"
+arch=(any)
+url=http://shimmerproject.org/projects/greybird/
+license=(CCPL:by-sa-3.0 GPL)
+groups=(xfce-themes-shimmer-collection)
+depends=(gtk-engine-murrine)
+optdepends=('elementary-xfce-icons: matching icon set; use the dark icon theme'
+    'gtk-engine-unico: required for gtk3 support for the classic theme; not required for the current theme'
+    'gtk3: required for CSS/GTK3 theme'
+    'lightdm-gtk-greeter: required for the LightDM GTK theme'
+    'lightdm-unity-greeter: required for the LightDM Unity theme'
+    'shimmer-wallpapers: contains the Greybird wallpaper, among others')
+conflicts=($pkgname-git)
+source=($pkgname-$pkgver.tar.gz::https://github.com/shimmerproject/$_pkgname/archive/v$pkgver.tar.gz
+    $pkgname-$_pkgverclassic.tar.gz::https://github.com/shimmerproject/$_pkgname/archive/v$_pkgverclassic.tar.gz)
+sha256sums=('374bc55d6af98ca6052cc5dd6c55db3b1ce9002fe81d3fde3e9b72febe697878'
+    'b63da3527760c194bb7299c1cb45297268439740e52e2c5e1f39fc31dce6293a')
+sha512sums=('1e4f7dea5e0206972d7d4a5bf42b353abf21e40d215fc1b0e7b546a4c95c7ce0604a37e9f2ad6c272fedf4720d0a5eee732a6b89d83c635c24082c24711c9e5e'
+    '09f19bbfe02a477de6635198736897d143a5eec8ed13e6d1863c80f5d78b341ecdf2b2cf48bffddead25082eeadde475d360fc7bee773307c5cc10fb3ff90034')
 
 package() {
-    cd "${srcdir}/shimmerproject-Greybird"*
-
-    # Create installation directories
-    install -d -m755 "${pkgdir}/usr/share/themes/Greybird"{,\ Compact}
-
-    # Install the current theme
-    cp -a * "${pkgdir}/usr/share/themes/Greybird/"
+    local _themedir="$pkgdir/usr/share/themes"
+    install -d "$_themedir/$_pkgname "{Classic,Compact}
 
-    # Make a symbolic link for the compact version of the xfwm4 theme
-    cd "${pkgdir}/usr/share/themes/Greybird Compact"
-    ln -s "../${_pkgname}/xfwm4_compact" "xfwm4"
+    cp -rf $_pkgname-$pkgver/ "$_themedir"/$_pkgname/
+    rm "$_themedir"/$_pkgname/.gitignore
+    cp -rf $_pkgname-$_pkgverclassic/gtk-{2,3}.0 "$_themedir/$_pkgname Classic"
+    ln -s /usr/share/themes/$_pkgname/xfwm4_compact "$_themedir/$_pkgname Compact/xfwm4"
 }
-md5sums=('d7c291408cd644e102cf811ee62e7a37')
diff --git a/pcr/xsynth-dssi/PKGBUILD b/pcr/xsynth-dssi/PKGBUILD
new file mode 100644
index 000000000..f353b9bfa
--- /dev/null
+++ b/pcr/xsynth-dssi/PKGBUILD
@@ -0,0 +1,28 @@
+# Maintainer: Guest One <theguestone at gmail dot com>
+
+pkgname=xsynth-dssi
+pkgver=0.9.4
+pkgrel=1
+pkgdesc="An analog-style (VCOs-VCF-VCA) synth plugin for DSSI"
+arch=('i686')
+url="http://dssi.sourceforge.net/download.html#Xsynth-DSSI"
+license=('GPL')
+depends=('gtk2' 'liblo')
+makedepends=('dssi' 'ladspa')
+options=('!libtool')
+source=(http://downloads.sourceforge.net/project/dssi/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz
+        xsynth-dssi)
+md5sums=('3432ecdac06407a992f80eb1c1ecf7cd'
+         'c346e6a944f202fccb2278b77a5e184b')
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr
+  make || return 1
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR=${pkgdir} install || return 1
+  install -D -m755 ${srcdir}/xsynth-dssi ${pkgdir}/usr/bin/xsynth-dssi
+}
+
diff --git a/pcr/xsynth-dssi/xsynth-dssi b/pcr/xsynth-dssi/xsynth-dssi
new file mode 100644
index 000000000..5503b12ba
--- /dev/null
+++ b/pcr/xsynth-dssi/xsynth-dssi
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+export DSSI_PATH=/usr/lib/dssi
+exec jack-dssi-host xsynth-dssi.so
diff --git a/pcr/yafaray-git/PKGBUILD b/pcr/yafaray/PKGBUILD
index 1d4b3436c..e3c0381d8 100644
--- a/pcr/yafaray-git/PKGBUILD
+++ b/pcr/yafaray/PKGBUILD
@@ -1,18 +1,18 @@
 # Maintainer: Márcio Silva <coadde@lavabit.com>
 
 pkgname=(
-  yafaray-git
-  blender-addon-yafaray-git
+  yafaray
+  blender-addon-yafaray
 )
-_pkgflag=git
-_pkgname=${pkgname[0]%-$_pkgflag}
+_pkgname=${pkgname[0]}
 _bldname=${pkgname[1]::7}
 _gitname=Core
 _addname=${_bldname^}-Exporter
-pkgver=$(LC_ALL=C date -u +%Y%m%d)
-_pkgver=1.2
-_bldver=2.66
-_bldep=7
+_pkgdate=20130510
+pkgver=1.5.$_pkgdate
+_srcver=44323def5b3866ff601fd401ef2160b80ced8141 # Fri May 10 00:57:12 2013 -0700 - Merge pull request #67 from DarkTide/master // Depth fix for hist on background
+_bldver=2.67
+_bldep=8
 _pyver=3.3
 pkgrel=1
 pkgdesc='A libre software raytracing engine'
@@ -27,7 +27,7 @@ depends=(
   freetype2
   libjpeg
   libxml2
-  'openexr=2.0.0'
+  openexr
 )
 optdepends=(
   'python: Python bindings'
@@ -41,17 +41,17 @@ makedepends=(
   qt4
   swig
 )
-provides=($_pkgname=$_pkgver)
-conflicts=$_pkgname
 source=(
-  git://github.com/YafaRay/$_gitname.$_pkgflag
-  git://github.com/YafaRay/$_addname.$_pkgflag
+  git://github.com/YafaRay/$_gitname.git
+  git://github.com/YafaRay/$_addname.git
 )
 sha512sums=(SKIP SKIP)
 
 prepare() {
   cd $srcdir/$_gitname
 
+  git checkout $_srcver
+
   [[ -d build ]] && rm -r build
   mkdir build
 }
@@ -62,17 +62,17 @@ build() {
   setarch $CARCH cmake .. -DCMAKE_INSTALL_PREFIX=/usr\
     -DYAF_PY_VERSION=$_pyver\
     -DYAF_BINDINGS_PY_DIR=/usr/lib/python$_pyver
-
   setarch $CARCH make
 }
 
-package_yafaray-git() {
+package_yafaray() {
   cd $srcdir/$_gitname/build
   setarch $CARCH make DESTDIR=$pkgdir install
 }
 
-package_blender-addon-yafaray-git() {
+package_blender-addon-yafaray() {
   pkgver=$pkgver.v$_bldver
+  _srcver=e6688fc4f480bcb1ae7d0a6dbe65563b3d070169 # Fri May 10 00:24:58 2013 -0700 - Merge pull request #14 from DarkTide/master // Version bump, and some other fixes
   pkgdesc="A addon for the ${_bldname^} which allows render with YafaRay (built for the $_bldname-libre package)"
   arch=any
   depends=(
@@ -80,24 +80,14 @@ package_blender-addon-yafaray-git() {
     "$_bldname>=$(($_bldep-1)):$_bldver"
     "$_bldname<$_bldep:${_bldver::2}$((${_bldver:2:4}+1))"
   )
-  optdepends=''
-  provides=(
-    ${pkgname%-$_pkgflag}=$_pkgver.v$_bldver
-    $_pkgname-$_bldname-exporter=$_pkgver.v$_bldver
-    $_pkgname-$_bldname-exporter-$_pkgflag=$pkgver
-  )
-  conflicts=(
-    ${pkgname%-$_pkgflag}
-    $_pkgname-$_bldname-exporter
-    $_pkgname-$_bldname-exporter-$_pkgflag
-  )
-  replaces=$_pkgname-$_bldname-exporter-$_pkgflag
+  optdepends=
 
   cd $srcdir/$_addname
 
   a=/usr/lib
   b=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons/$_pkgname/bin
 
+  git checkout $_srcver
   git checkout-index -a -f --prefix=${b%bin}
 
   install -d $b
diff --git a/pcr/zoneminder/PKGBUILD b/pcr/zoneminder/PKGBUILD
index 236ceca01..bf03b4133 100644
--- a/pcr/zoneminder/PKGBUILD
+++ b/pcr/zoneminder/PKGBUILD
@@ -1,3 +1,4 @@
+# Maintainer:  Jacek Burghardt           <jacek@hebe.us>
 # Maintainer:  Vojtech Aschenbrenner     <v@asch.cz>
 # Contributor: Jason Gardner             <buhrietoe@gmail.com>
 # Contributor: Ross melin                <rdmelin@gmail.com>
@@ -9,12 +10,13 @@
 pkgbase=zoneminder
 pkgname=zoneminder
 pkgver=1.25.0
-pkgrel=24
+pkgrel=27
 pkgdesc='Capture, analyse, record and monitor video security cameras'
 arch=(
   i686
   x86_64
   mips64el
+  arm
 )
 backup=(
   etc/zm.conf
@@ -26,7 +28,6 @@ license=(
 depends=(
   apache
   cambozola
-  libav-static
   gnutls
   mariadb
   perl-archive-zip
@@ -59,110 +60,67 @@ source=(
   httpd-$pkgbase.conf
   $pkgbase
   $pkgbase.service
+  zoneminder-1.25.0-kernel35.patch
+  zoneminder-1.25.0-gcc47.patch
+  zoneminder-1.25.0-ffmpeg.patch
+  zoneminder-1.25-text.patch
+  zoneminder-1.25-fixwarning.patch
+  zoneminder-1.25.0-gcrypt.patch
 )
 sha512sums=(
   3e18993b0539729491052c97d8c94227ccc089eb40277c2f07682f30049033303c7cfe9734fdac6d33ae67df29c76eb72bf7fbb5dae8227e8831fa603b61c375
   4ce0d8eba9d006d258f5b8a83920fc17f1f602b96518d37b7a47cd9b6eb84ef2587641a6ba839a469c3f0e33b46475866187279ae3f8be0d4054b074ee5d6b08
   ab4e1d5ddaf4d9cd53d6ca59d7965902afd6a2dc830fbbafa270736c52c2b3563075fee860bb0276466f96e9dbfb71b259ac45a4ae2e4ead8eaec154a0159eb0
   cfb0eb87a989236c72741a496ddc6a73aa2696e5beaaca4836d3c231ddb24c7ef5e9f65e7afa49674f2115cbfa4a07c75486e1947ce294c816ddbb875f3b99cf
+  4fa79e49a3c04e9fdc9823792c6a28012002479c77ed41637bd2d21f089e4c15592bfcd5c24028f356c9f80d774a5080a6841e8e70a435d607e3089d0b121775
+  3da7d4d21dea166ea12b49e88a05a9f7a75790881a1f2d7588fa9e0e6ce592b4b5ee71994fa8b05236efeeb57890157a622c752c12a9059c2ee915adf3b4660d
+  7fc2a4663c3103bef641be065bd7992a2b3dc0699f1b99dc2fdb34c1c48e58686e490d3ade523ef7c8e29b3f04109658eef652c26ff6ee3fb9aee65453bdb6c4
+  17b85051543c34a41c6b94ec8f46a10927aa4bc9554562650788c8257ffba8e362500cf3641708f2f9dabebc663a2d012fa9feacd7f9b33c637fbc965d405adf
+  8eab0a922968465fee8537dc035ce781e51dc84cc05259a32acb5bf59c618bc1700dbf4eec90717ed5959841def119357974d109df8d7450c12ca4ea8576e55c
+  8c9e7debcaf60be1c2dda656f95e497f6812d704edc3ca4a1c915a3b3c9dc1749c91d96bc2d60db7d90d5edfd9e2dfc39010dfe4feabfecfffd27f1fffc3d675
 )
 
 build() {
   cd $srcdir/ZoneMinder-$pkgver
-
-  # ZM_RUNDIR need change to run dir
-  export CPPFLAGS=-D__STDC_CONSTANT_MACROS\
-    OPT_FFMPEG=yes\
-    PATH_FFMPEG=/usr/bin/avconv-static\
-    ZM_LOGDIR=/var/log/$pkgbase\
-    ZM_RUNDIR=/tmp/$pkgbase\
-    ZM_SSL_LIB=gnutls\
-    ZM_TMPDIR=/tmp/$pkgbase
-
-  # Patch for GCC 4.7.x
-  sed -i -e 's/^#include <errno.h>/#include <errno.h>\n#include <unistd.h>/'\
-     src/zm_logger.cpp || read
-  sed -i -e 's/^#include <pthread.h>/#include <pthread.h>\n#include <unistd.h>/'\
-     src/zm_thread.h || read
-
-  # Patch for automake 1.12
-  sed -i -e '/am__api_version=/ s/1.11/1.12/'\
-    configure || read
-
-  # Patch for disable ZM_CHECK_FOR_UPDATES
-  sed -i -e '/ZM_CHECK_FOR_UPDATES/,+1 s/yes/no/'\
-    scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read
-
-  # Patch for support html5 video and flv
-  sed -i -e '/ZM_MPEG_LIVE_FORMAT/,+1 s/swf/webm/;/ZM_MPEG_REPLAY_FORMAT/,+1 s/swf/webm/;
-    /ZM_FFMPEG_FORMATS/,+1 s/mpg mpeg wmv asf avi\* mov swf 3gp\*\*/mpg mpeg wmv asf avi\* mov flv swf 3gp\*\* webm ogg h264/'\
-    scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read
-
-  # Patch for enable video export
-  #sed -i -e '/ZM_OPT_FFMPEG/,+1 s/@OPT_FFMPEG@/yes/;
-  #  /ZM_PATH_FFMPEG/,+1 s/@PATH_FFMPEG@/\/usr\/bin\/avconv-static/'\
-  #  scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read
-
-  # Patch for change path run dir
-  sed -i -e '/ZM_PATH_SOCKS/,+1 s/TMP/RUN/'\
-    scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read
-
   # Patch for change ZM name to ZoneMinder
   sed -i -e '/ZM_WEB_TITLE_PREFIX/,+1 s/"ZM"/"ZoneMinder"/'\
     scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read
-
-  # Patch for v4l2 convert support
-  sed -i -e "s/$ENV{SHELL} = \'\/bin\/sh\' if exists $ENV{SHELL};/$ENV{SHELL} = \'\/bin\/sh\' if exists $ENV{SHELL};\n$ENV{LD_PRELOAD} = \'\/usr\/lib\/libv4l\/v4l2convert.so\' ;/"\
-    scripts/zmdc.pl.in || read
-
-  # Patch for add more socket tries
+  sed -i -e '/am__api_version=/ s/1.11/1.13.1/'\
+        configure || read
+    # Patch for add more socket tries
   sed -i -e '/$max_socket_tries/ s/3/15/'\
-    web/ajax/stream.php || read
-
-  # Patch for wrong "suppported"
+      web/ajax/stream.php || read
+   # Patch for support html5 video and flv
+  sed -i -e '/ZM_MPEG_LIVE_FORMAT/,+1 s/swf/webm/;/ZM_MPEG_REPLAY_FORMAT/,+1 s/swf/webm/;
+     /ZM_FFMPEG_FORMATS/,+1 s/mpg mpeg wmv asf avi\* mov swf 3gp\*\*/mpg mpeg wmv asf avi\* mov flv swf 3gp\*\* webm ogg h264/'\
+     scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read
+   # Patch for wrong "suppported"
   sed -i -e 's/suppported/supported/'\
      src/zm_local_camera.cpp || read
+  
 
-  # Patch for type cast in linux-libre kernel 3.5
-  sed -i -e 's/enum v4l2_buf_type type = v4l2_data.fmt.type;/enum v4l2_buf_type type = (v4l2_buf_type)v4l2_data.fmt.type;/'\
-    src/zm_local_camera.cpp || read
-
-  # Patch for drop custom perl install paths
-  sed -i -e '/# Slight hack for non-standard perl install paths/,+10 d;
-    s/^AC_SUBST(ZM_CONFIG,"$SYSCONFDIR\/zm.conf")/AC_SUBST(ZM_CONFIG,"$SYSCONFDIR\/zm.conf")\n\nEXTRA_PERL_LIB="# Include from system perl paths only"\nPERL_MM_PARMS="INSTALLDIRS=vendor"/'\
-    configure.ac
-
-  # Patch for support ffmpeg with <libavutil/mathematics.h> and C library
-  sed -i -e 's/^extern "C" {/extern "C" {\n#ifdef _STDINT_H\n#undef _STDINT_H\n#endif\n#include <stdint.h>/
-    s/^#include <libavutil\/avutil.h>/#include <libavutil\/avutil.h>\n#include <libavutil\/mathematics.h>/'\
-    src/zm_ffmpeg.h
-  sed -i -e 's/^AM_CONFIG_HEADER(config.h)/AM_CONFIG_HEADER(config.h)\n\nAC_SUBST([AM_CXXFLAGS], [-D__STDC_CONSTANT_MACROS])/;
-    s/^AC_CHECK_HEADERS(mysql\/mysql.h,,AC_MSG_ERROR(zm requires MySQL headers - check that MySQL development packages are installed),)/AC_CHECK_HEADERS(mysql\/mysql.h,,AC_MSG_ERROR(zm requires MySQL headers - check that MySQL development packages are installed),)\nAC_LANG_PUSH([C])/;
-    s/^AC_CHECK_HEADERS(libswscale\/swscale.h,,,)/AC_CHECK_HEADERS(libswscale\/swscale.h,,,)\nAC_LANG_POP([C])/'\
-    configure.ac
+   patch -Np1 -F99 -i ../zoneminder-1.25.0-kernel35.patch
+   patch -Np1 -F99 -i ../zoneminder-1.25.0-gcc47.patch 
+   patch -Np1 -F99 -i ../zoneminder-1.25.0-ffmpeg.patch
+   patch -Np1 -F99 -i ../zoneminder-1.25-text.patch   
+   patch -Np1 -F99 -i ../zoneminder-1.25-fixwarning.patch
+   patch -Np1 -F99 -i ../zoneminder-1.25.0-gcrypt.patch
 
-  # Patch for wrong install run, tmp and log dir
-  sed -i -e '/ install-data-hook/d;/install-data-hook:/d;/# Yes, you are correct. This is a HACK!/d;
-    /	( cd $(DESTDIR)$(sysconfdir); chown $(webuser):$(webgroup) $(sysconf_DATA); chmod 600 $(sysconf_DATA) )/d;
-    /	( if ! test -e $(ZM_RUNDIR); then mkdir -p $(ZM_RUNDIR); fi; if test "$(ZM_RUNDIR)" != "\/var\/run"; then chown $(webuser):$(webgroup) $(ZM_RUNDIR); chmod u+w $(ZM_RUNDIR); fi )/d;
-    /	( if ! test -e $(ZM_TMPDIR); then mkdir -m 700 -p $(ZM_TMPDIR); fi; if test "$(ZM_TMPDIR)" != "\/tmp"; then chown $(webuser):$(webgroup) $(ZM_TMPDIR); chmod u+w $(ZM_TMPDIR); fi )/d;
-    /	( if ! test -e $(ZM_LOGDIR); then mkdir -p $(ZM_LOGDIR); fi; if test "$(ZM_LOGDIR)" != "\/var\/log"; then chown $(webuser):$(webgroup) $(ZM_LOGDIR); chmod u+w $(ZM_LOGDIR); fi )/,+1 d'\
-    Makefile.{am,in}
-
-  ./configure --prefix=/usr\
+export CXXFLAGS=-D__STDC_CONSTANT_MACROS
+./configure --prefix=/usr\
     --enable-crashtrace=no\
     --enable-debug=no\
     --enable-mmap=yes\
     --sysconfdir=/etc\
     --with-cgidir=/srv/http/cgi-bin\
     --with-extralibs='-L/usr/lib -L/usr/lib/mysql'\
-    --with-ffmpeg=/opt/libav-static\
     --with-libarch=lib\
+    --with-ffmpeg=/usr \
     --with-mysql=/usr\
     --with-webdir=/srv/http/$pkgbase\
     --with-webgroup=http\
     --with-webhost=localhost\
-    --with-webuser=http
+    --with-webuser=http \
 
   make V=0
 }
@@ -173,8 +131,9 @@ package() {
   make DESTDIR=$pkgdir install
 
   mkdir -p $pkgdir/{etc/{httpd/conf/extra,rc.d},srv/http/{cgi-bin,$pkgbase},usr/{lib/systemd/system,share/{license/$pkgbase,$pkgbase/db}},var/{cache/$pkgbase,log/$pkgbase}}
-
+  mkdir -p $pkgdir/srv/zoneminder/socks
   chown -R http.http $pkgdir/{etc/zm.conf,var/{cache/$pkgbase,log/$pkgbase}}
+  chown -R http.http $pkgdir/srv/zoneminder/socks
   chmod 0700 $pkgdir/etc/zm.conf
 
   for i in events images temp; do
diff --git a/pcr/zoneminder/zoneminder-1.25-fixwarning.patch b/pcr/zoneminder/zoneminder-1.25-fixwarning.patch
new file mode 100644
index 000000000..0d151d139
--- /dev/null
+++ b/pcr/zoneminder/zoneminder-1.25-fixwarning.patch
@@ -0,0 +1,14 @@
+diff -U 3 -H -d -r -N -- ZoneMinder-1.24.2/src/zm_image.cpp ZoneMinder-1.24.2-patch/src/zm_image.cpp
+--- ZoneMinder-1.24.2/src/zm_image.cpp	2009-05-25 20:04:00.000000000 +0200
++++ ZoneMinder-1.24.2-patch/src/zm_image.cpp	2009-07-04 16:31:45.000000000 +0200
+@@ -776,7 +776,8 @@
+ 
+ 		while( pdest < (buffer+size) )
+ 		{
+-			*pdest++ = (*blend_ptr)[*pdest][*psrc++];
++			*pdest = (*blend_ptr)[*pdest][*psrc++];
++			pdest++;
+ 		}
+ 	}
+ 	else
+
diff --git a/pcr/zoneminder/zoneminder-1.25-text.patch b/pcr/zoneminder/zoneminder-1.25-text.patch
new file mode 100644
index 000000000..90885f1b5
--- /dev/null
+++ b/pcr/zoneminder/zoneminder-1.25-text.patch
@@ -0,0 +1,12 @@
+--- ZoneMinder-1.25.0/src/zm_stream.cpp	2009-05-08 09:47:27.000000000 -0400
++++ ZoneMinder-1.25.0.ajs/src/zm_stream.cpp	2013-01-14 16:52:18.000000000 -0500
+@@ -262,7 +262,7 @@ bool StreamBase::sendTextFrame( const ch
+         fprintf( stdout, "--ZoneMinderFrame\r\n" );
+         fprintf( stdout, "Content-Length: %d\r\n", n_bytes );
+         fprintf( stdout, "Content-Type: image/jpeg\r\n\r\n" );
+-        if ( fwrite( buffer, n_bytes, 1, stdout ) )
++        if ( fwrite( buffer, n_bytes, 1, stdout ) != 1 )
+         {
+             Error( "Unable to send stream text frame: %s", strerror(errno) );
+             return( false );
+
diff --git a/pcr/zoneminder/zoneminder-1.25.0-ffmpeg.patch b/pcr/zoneminder/zoneminder-1.25.0-ffmpeg.patch
new file mode 100644
index 000000000..99d41ee33
--- /dev/null
+++ b/pcr/zoneminder/zoneminder-1.25.0-ffmpeg.patch
@@ -0,0 +1,130 @@
+diff -Naur ZoneMinder-1.25.0-a/configure.ac ZoneMinder-1.25.0-b/configure.ac
+--- ZoneMinder-1.25.0-a/configure.ac	2011-08-23 09:10:32.000000000 -0600
++++ ZoneMinder-1.25.0-b/configure.ac	2013-05-06 11:17:33.860608307 -0600
+@@ -95,7 +95,7 @@
+ 
+ LDFLAGS="${FFMPEG_LIBS} $LDFLAGS"
+ CFLAGS="${FFMPEG_CFLAGS} $CFLAGS"
+-CPPFLAGS="${FFMPEG_CFLAGS} $CPPFLAGS"
++CPPFLAGS="${FFMPEG_CFLAGS} $CPPFLAGS -D__STDC_CONSTANT_MACROS"
+ 
+ EXTRA_LIBS=
+ AC_ARG_WITH(extralibs,
+@@ -275,8 +275,7 @@
+ AC_CHECK_LIB(x264,x264_predict_16x16_init)
+ AC_CHECK_LIB(avutil,av_malloc,,AC_MSG_WARN(libavutil.a may be required for MPEG streaming))
+ # Don't bother to warn about this one
+-AC_CHECK_LIB(avcore,av_image_copy,,)
+-AC_CHECK_LIB(avcodec,avcodec_init,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
++AC_CHECK_LIB(avcodec,avcodec_register_all,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
+ AC_CHECK_LIB(avformat,av_new_stream,,AC_MSG_WARN(libavformat.a is required for MPEG streaming))
+ AC_CHECK_LIB(avdevice,avdevice_register_all,,AC_MSG_WARN(libavdevice.a may be required for MPEG streaming))
+ AC_CHECK_LIB(swscale,sws_scale,,,-lswscale)
+diff -Naur ZoneMinder-1.25.0-a/src/zm_ffmpeg.h ZoneMinder-1.25.0-b/src/zm_ffmpeg.h
+--- ZoneMinder-1.25.0-a/src/zm_ffmpeg.h	2011-06-24 10:05:07.000000000 -0600
++++ ZoneMinder-1.25.0-b/src/zm_ffmpeg.h	2013-05-06 18:11:49.327274977 -0600
+@@ -43,6 +43,11 @@
+ }
+ #endif
+ 
++#include <libavutil/avutil.h>
++#include <libavcodec/avcodec.h>
++#include <libavformat/avformat.h>
++#include <libswscale/swscale.h>
++
+ #if FFMPEG_VERSION_INT == 0x000408
+ #define ZM_FFMPEG_048	1
+ #elif FFMPEG_VERSION_INT == 0x000409
+diff -Naur ZoneMinder-1.25.0-a/src/zm_ffmpeg_camera.cpp ZoneMinder-1.25.0-b/src/zm_ffmpeg_camera.cpp
+--- ZoneMinder-1.25.0-a/src/zm_ffmpeg_camera.cpp	2011-06-21 01:40:13.000000000 -0600
++++ ZoneMinder-1.25.0-b/src/zm_ffmpeg_camera.cpp	2013-05-06 19:57:08.453941643 -0600
+@@ -91,7 +91,7 @@
+     Info( "Priming capture from %s", mPath.c_str() );
+ 
+     // Open the input, not necessarily a file
+-    if ( av_open_input_file( &mFormatContext, mPath.c_str(), NULL, 0, NULL ) !=0 )
++    if ( avformat_open_input( &mFormatContext, mPath.c_str(), NULL, NULL ) !=0 )
+         Fatal( "Unable to open input %s due to: %s", mPath.c_str(), strerror(errno) );
+ 
+     // Locate stream info from input
+@@ -122,7 +122,7 @@
+         Fatal( "Can't find codec for video stream from %s", mPath.c_str() );
+ 
+     // Open the codec
+-    if ( avcodec_open( mCodecContext, mCodec ) < 0 )
++    if ( avcodec_open2( mCodecContext, mCodec, NULL ) < 0 )
+         Fatal( "Unable to open codec for video stream from %s", mPath.c_str() );
+ 
+     // Allocate space for the native video frame
+diff -Naur ZoneMinder-1.25.0-a/src/zm_mpeg.cpp ZoneMinder-1.25.0-b/src/zm_mpeg.cpp
+--- ZoneMinder-1.25.0-a/src/zm_mpeg.cpp	2011-05-15 14:39:06.000000000 -0600
++++ ZoneMinder-1.25.0-b/src/zm_mpeg.cpp	2013-05-06 20:00:08.923941640 -0600
+@@ -130,7 +130,7 @@
+ {
+ 	/* set the output parameters (must be done even if no
+ 	   parameters). */
+-	if ( av_set_parameters(ofc, NULL) < 0 )
++	if ( avformat_write_header(ofc, NULL) < 0 )
+ 	{
+ 		Panic( "Invalid output format parameters" );
+ 	}
+@@ -176,7 +176,7 @@
+ 		}
+ 
+ 		/* open the codec */
+-		if ( avcodec_open(c, codec) < 0 )
++		if ( avcodec_open2(c, codec, NULL) < 0 )
+ 		{
+ 			Panic( "Could not open codec" );
+ 		}
+@@ -222,7 +222,7 @@
+ 	if ( !(of->flags & AVFMT_NOFILE) )
+ 	{
+ #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,2,1)
+-		if ( avio_open(&ofc->pb, filename, URL_WRONLY) < 0 )
++		if ( avio_open(&ofc->pb, filename, AVIO_FLAG_WRITE) < 0 )
+ #else
+ 		if ( url_fopen(&ofc->pb, filename, URL_WRONLY) < 0 )
+ #endif
+@@ -241,7 +241,7 @@
+ 	}
+ 
+ 	/* write the stream header, if any */
+-	av_write_header(ofc);
++	avformat_write_header(ofc, NULL);
+ }
+ 
+ VideoStream::VideoStream( const char *filename, const char *format, int bitrate, double frame_rate, int colours, int width, int height )
+diff -Naur ZoneMinder-1.25.0-a/src/zm_remote_camera_rtsp.cpp ZoneMinder-1.25.0-b/src/zm_remote_camera_rtsp.cpp
+--- ZoneMinder-1.25.0-a/src/zm_remote_camera_rtsp.cpp	2011-06-21 03:19:10.000000000 -0600
++++ ZoneMinder-1.25.0-b/src/zm_remote_camera_rtsp.cpp	2013-05-06 20:07:40.797274975 -0600
+@@ -145,7 +145,7 @@
+         Panic( "Unable to locate codec %d decoder", codecContext->codec_id );
+ 
+     // Open codec
+-    if ( avcodec_open( codecContext, codec ) < 0 )
++    if ( avcodec_open2( codecContext, codec, NULL ) < 0 )
+         Panic( "Can't open codec" );
+ 
+     picture = avcodec_alloc_frame();
+diff -Naur ZoneMinder-1.25.0-a/src/zm_sdp.h ZoneMinder-1.25.0-b/src/zm_sdp.h
+--- ZoneMinder-1.25.0-a/src/zm_sdp.h	2011-05-15 14:39:06.000000000 -0600
++++ ZoneMinder-1.25.0-b/src/zm_sdp.h	2013-05-06 20:23:28.237274974 -0600
+@@ -41,7 +41,7 @@
+         int payloadType;
+         const char payloadName[6];
+         enum AVMediaType codecType;
+-        enum CodecID codecId;
++        enum AVCodecID codecId;
+         int clockRate;
+         int autoChannels;
+     };
+@@ -50,7 +50,7 @@
+     {
+         const char payloadName[32];
+         enum AVMediaType codecType;
+-        enum CodecID codecId;
++        enum AVCodecID codecId;
+         //int clockRate;
+         //int autoChannels;
+     };
diff --git a/pcr/zoneminder/zoneminder-1.25.0-gcc47.patch b/pcr/zoneminder/zoneminder-1.25.0-gcc47.patch
new file mode 100644
index 000000000..a083c6dbc
--- /dev/null
+++ b/pcr/zoneminder/zoneminder-1.25.0-gcc47.patch
@@ -0,0 +1,33 @@
+diff -up ./src/zm_local_camera.cpp.gcc47 ./src/zm_local_camera.cpp
+--- ./src/zm_local_camera.cpp.gcc47	2011-06-21 04:19:10.000000000 -0500
++++ ./src/zm_local_camera.cpp	2012-01-19 13:43:49.142440717 -0600
+@@ -26,6 +26,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
++#include <limits.h>
+ #include <unistd.h>
+ #include <sys/mman.h>
+ #include <errno.h>
+diff -up ./src/zm_logger.cpp.gcc47 ./src/zm_logger.cpp
+--- ./src/zm_logger.cpp.gcc47	2011-06-28 06:07:35.000000000 -0500
++++ ./src/zm_logger.cpp	2012-01-19 13:43:49.142440717 -0600
+@@ -33,6 +33,7 @@
+ #include <signal.h>
+ #include <stdarg.h>
+ #include <errno.h>
++#include <unistd.h>
+ 
+ bool Logger::smInitialised = false;
+ Logger *Logger::smInstance = 0;
+diff -up ./src/zm_thread.h.gcc47 ./src/zm_thread.h
+--- ./src/zm_thread.h.gcc47	2012-01-19 13:44:43.082766722 -0600
++++ ./src/zm_thread.h	2012-01-19 13:44:56.966335869 -0600
+@@ -21,6 +21,7 @@
+ #define ZM_THREAD_H
+ 
+ #include <pthread.h>
++#include <unistd.h>
+ #include "zm_exception.h"
+ #include "zm_utils.h"
+ 
diff --git a/pcr/zoneminder/zoneminder-1.25.0-gcrypt.patch b/pcr/zoneminder/zoneminder-1.25.0-gcrypt.patch
new file mode 100644
index 000000000..21f197ec6
--- /dev/null
+++ b/pcr/zoneminder/zoneminder-1.25.0-gcrypt.patch
@@ -0,0 +1,86 @@
+diff -up ./configure.ac.gcrypt ./configure.ac
+--- ./configure.ac.gcrypt	2012-01-19 12:58:20.647123209 -0600
++++ ./configure.ac	2012-01-19 13:12:34.186669577 -0600
+@@ -13,7 +13,7 @@ AC_ARG_VAR(ZM_DB_HOST,[Hostname where Zo
+ AC_ARG_VAR(ZM_DB_NAME,[Name of ZoneMinder database, default zm])
+ AC_ARG_VAR(ZM_DB_USER,[Name of ZoneMinder database user, default zmuser])
+ AC_ARG_VAR(ZM_DB_PASS,[Password of ZoneMinder database user, default zmpass])
+-AC_ARG_VAR(ZM_SSL_LIB,[Library to use for ssl functions, default gnutls])
++AC_ARG_VAR(ZM_SSL_LIB,[Library to use for MD5 function, default libgcrypt])
+ AC_ARG_VAR(ZM_MYSQL_ENGINE,[MySQL engine to use with database, default MyISAM])
+ AC_ARG_VAR(ZM_RUNDIR,[Location of transient process files, default /var/run/zm])
+ AC_ARG_VAR(ZM_TMPDIR,[Location of temporary files, default /tmp/zm])
+@@ -32,7 +32,7 @@ if test "$ZM_DB_PASS" == ""; then
+ 	AC_SUBST(ZM_DB_PASS,[zmpass])
+ fi
+ if test "$ZM_SSL_LIB" == ""; then
+-	AC_SUBST(ZM_SSL_LIB,gnutls)
++	AC_SUBST(ZM_SSL_LIB,libgcrypt)
+ fi
+ if test "$ZM_MYSQL_ENGINE" == ""; then
+ 	AC_SUBST(ZM_MYSQL_ENGINE,MyISAM)
+@@ -264,11 +264,10 @@ AC_CHECK_LIB(jpeg,jpeg_start_compress,,A
+ AC_CHECK_LIB(pthread,pthread_create,,AC_MSG_ERROR(zm requires libpthread.a))
+ AC_CHECK_LIB(dl,dlsym,,AC_MSG_ERROR(zm requires libdl.a))
+ if test "$ZM_SSL_LIB" == "openssl"; then
+-AC_CHECK_LIB(crypto,MD5,,AC_MSG_WARN([libcrypto.a is required for authenticated streaming - use ZM_SSL_LIB option to select gnutls instead]))
++AC_CHECK_LIB(crypto,MD5,,AC_MSG_WARN([libcrypto.a is required for authenticated streaming - use ZM_SSL_LIB option to select libgcrypt instead]))
+ else
+-AC_CHECK_HEADERS(gcrypt.h,,AC_MSG_WARN(zm requires libgcrypt headers to be installed for gnutls),)
++AC_CHECK_HEADERS(gcrypt.h,,AC_MSG_WARN(zm requires libgcrypt headers to be installed),)
+ AC_CHECK_LIB(gcrypt,gcry_check_version,,AC_MSG_WARN([libgcrypt.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead]))
+-AC_CHECK_LIB(gnutls-openssl,MD5,,AC_MSG_WARN([gnutls-openssl.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead]))
+ fi
+ AC_CHECK_LIB(pcre,pcre_compile,,AC_MSG_WARN(libpcre.a may be required for remote/network camera support))
+ AC_CHECK_LIB(z,zlibVersion)
+@@ -320,9 +319,6 @@ AC_CHECK_DECLS(round,,,[#include <math.h
+ if test "$ZM_SSL_LIB" == "openssl"; then
+ AC_CHECK_DECLS(MD5,,AC_MSG_ERROR([zm requires openssl/md5.h - use ZM_SSL_LIB option to select gnutls instead]),[#include <stdlib.h>
+ #include <openssl/md5.h>])
+-else
+-AC_CHECK_DECLS(MD5,,AC_MSG_ERROR([zm requires gnutls/openssl.h - use ZM_SSL_LIB option to select openssl instead]),[#include <stdlib.h>
+-#include <gnutls/openssl.h>])
+ fi
+ AC_CHECK_DECLS(backtrace,,,[#include <execinfo.h>])
+ 
+diff -up ./src/zm_user.cpp.gcrypt ./src/zm_user.cpp
+--- ./src/zm_user.cpp.gcrypt	2011-08-03 06:31:06.000000000 -0500
++++ ./src/zm_user.cpp	2012-01-19 12:58:20.654122992 -0600
+@@ -140,6 +140,18 @@ User *zmLoadUser( const char *username, 
+ 	return( user );
+ }
+ 
++#ifdef HAVE_GCRYPT_H
++#define HAVE_DECL_MD5 1
++#define MD5_DIGEST_LENGTH 16
++static unsigned char *MD5(const unsigned char *data, unsigned long len,
++                         unsigned char *md)
++{
++    gcry_md_hash_buffer(GCRY_MD_MD5, md, data, len);
++
++    return md;
++}
++#endif
++
+ // Function to validate an authentication string
+ User *zmLoadAuthUser( const char *auth, bool use_remote_addr )
+ {
+diff -up ./src/zm_user.h.gcrypt ./src/zm_user.h
+--- ./src/zm_user.h.gcrypt	2010-11-11 06:11:07.000000000 -0600
++++ ./src/zm_user.h	2012-01-19 13:14:11.200654694 -0600
+@@ -23,14 +23,11 @@
+ #ifndef ZM_USER_H

+ #define ZM_USER_H

+ 

+-#if HAVE_LIBGNUTLS_OPENSSL

+-#include <gnutls/openssl.h>

+ #if HAVE_GCRYPT_H

+ #include <gcrypt.h>

+-#endif // HAVE_GCRYPT_H

+ #elif HAVE_LIBCRYPTO

+ #include <openssl/md5.h>

+-#endif // HAVE_LIBGNUTLS_OPENSSL || HAVE_LIBCRYPTO

++#endif // HAVE_GCRYPT_H || HAVE_LIBCRYPTO

+ 

+ class User

+ {

diff --git a/pcr/zoneminder/zoneminder-1.25.0-kernel35.patch b/pcr/zoneminder/zoneminder-1.25.0-kernel35.patch
new file mode 100644
index 000000000..51bc1288d
--- /dev/null
+++ b/pcr/zoneminder/zoneminder-1.25.0-kernel35.patch
@@ -0,0 +1,21 @@
+diff -up ./src/zm_local_camera.cpp.kernel35 ./src/zm_local_camera.cpp
+--- ./src/zm_local_camera.cpp.kernel35	2012-07-16 15:01:22.182614878 -0500
++++ ./src/zm_local_camera.cpp	2012-07-16 15:02:16.491941730 -0500
+@@ -740,7 +740,7 @@ void LocalCamera::Terminate()
+     {
+         Debug( 3, "Terminating video stream" );
+         //enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+-        enum v4l2_buf_type type = v4l2_data.fmt.type;
++        enum v4l2_buf_type type = (v4l2_buf_type)v4l2_data.fmt.type;
+         if ( vidioctl( vid_fd, VIDIOC_STREAMOFF, &type ) < 0 )
+             Error( "Failed to stop capture stream: %s", strerror(errno) );
+ 
+@@ -1520,7 +1520,7 @@ int LocalCamera::PrimeCapture()
+ 
+         Debug( 3, "Starting video stream" );
+         //enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+-        enum v4l2_buf_type type = v4l2_data.fmt.type;
++        enum v4l2_buf_type type = (v4l2_buf_type)v4l2_data.fmt.type;
+         if ( vidioctl( vid_fd, VIDIOC_STREAMON, &type ) < 0 )
+             Fatal( "Failed to start capture stream: %s", strerror(errno) );
+     }
diff --git a/pcr/zoneminder/zoneminder.install b/pcr/zoneminder/zoneminder.install
index ecacf6437..899e2a5d1 100644
--- a/pcr/zoneminder/zoneminder.install
+++ b/pcr/zoneminder/zoneminder.install
@@ -69,9 +69,6 @@ post_install() {
     /^open_basedir/ s/:\/srv\/http\/zoneminder//;
     /^open_basedir/ s/:\/srv\/http\/zoneminder\///;
     /^open_basedir/ s/$/:\/srv\/http\/zoneminder/;
-    /^open_basedir/ s/:\/var\/cache\/zoneminder//;
-    /^open_basedir/ s/:\/var\/cache\/zoneminder\///;
-    /^open_basedir/ s/$/:\/var\/cache\/zoneminder/;
     ' /etc/php/php.ini || read
   sed -i -e '
     /^LoadModule php5_module modules\/libphp5.so/d;
@@ -82,7 +79,6 @@ post_install() {
     /^Include \/etc\/httpd\/conf\/extra\/httpd-zoneminder.conf/d;
     /^Include conf\/extra\/httpd-default.conf/ s/$/\n\n# PHP 5\n\Include \/etc\/httpd\/conf\/extra\/php5_module.conf\n\n# ZoneMinder\nInclude \/etc\/httpd\/conf\/extra\/httpd-zoneminder.conf/;
     ' /etc/httpd/conf/httpd.conf || read
-  gpasswd -a http video
   cat << EOF
 Note for mysql:
 ==> To run Zoneminder, you must install the database running mysql service (as root):
@@ -109,11 +105,11 @@ Note for php:
 ==> "extension=openssl.so"
 ==> "extension=ftp.so"
 ==> "extension=zip.so"
-==> check and add to open_basedir "/etc", 
-==> "/srv/http/zoneminder" and "/var/cache/zoneminder" like so
-==> "open_basedir = /home:/tmp:/usr/share/pear:/etc:/srv/http/zoneminder:/var/cache/zoneminder"
+==> check and add to open_basedir "/etc" and
+==> "/srv/http/zoneminder" like so
+==> "open_basedir = /home:/tmp:/usr/share/pear:/etc:/srv/http/zoneminder"
 ==> and set your timezone in php.ini:
-==> "date.timezone = <your_zone>/<your_city>"
+==> "date.timezone = <your_country>/<your_city>"
 
 Note for apache:
 ==> You must edit /etc/httpd/conf/httpd.conf and add the line:
@@ -136,7 +132,6 @@ post_remove() {
   sed -i -e '
     /^open_basedir/ s/:\/srv\/http\/zoneminder//;
     /^open_basedir/ s/:\/srv\/http\/zoneminder\///;
-    /^open_basedir/ s/:\/var\/cache\/zoneminder\///
     ' /etc/php/php.ini || read
   sed -i -e '
     /^# ZoneMinder/d;
@@ -170,12 +165,9 @@ Note:
 ==> "extension=mysqli.so"
 ==> "extension=session.so"
 ==> "extension=sockets.so"
-==> "date.timezone = <my_zone>/<my_city>"
+==> "date.timezone = <my_country>/<my_city>"
 
-==> Drop http user on video group if it isn't needed with others servers:
-==> gpasswd -d http video
-
-==> Edit /etc/php/php.ini and remove "/etc", "/srv/http/zoneminder" and "/var/cache/zoneminder"
+==> Edit /etc/php/php.ini and remove "/etc" and "/srv/http/zoneminder"
 ==> in the "open_basedir".
 
 ==> Remove log files and "zonemider" directory in "/var/log/zoneminder".