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

19 files changed, 432 insertions, 327 deletions

diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD
index a82766f1d..f226b76fd 100644
--- a/libre/blender-libre/PKGBUILD
+++ b/libre/blender-libre/PKGBUILD
@@ -10,10 +10,11 @@ else
   pkgname=blender-libre
   _spndesc=''
 fi
-epoch=7
-pkgver=2.67
+epoch=8
+pkgver=2.67a
+_jpgver=1.5
 _pyver=3.3
-pkgrel=2
+pkgrel=1
 pkgdesc="Fully integrated 3D graphics creation suite, without nonfree povray and cuda support$_spndesc"
 arch=(
   i686
@@ -58,7 +59,7 @@ conflicts=${_pkgname%-$_pkgflag}
 replaces=${_pkgname%-$_pkgflag}
 install=$_pkgname.install
 source=http://download.${_pkgname%-$_pkgflag}.org/source/${_pkgname%-$_pkgflag}-$pkgver.tar.gz
-sha512sums=678ff15b4c7aa5695ac31189c2532d959867dfd003d101a52fc8e294b2d7bc5a4699844db9fa6cc6f5e825aa5ba2da37cec0dc56bfd2686957eca075bf935f44
+sha512sums=1336ed00ab51c581ab5b8ef6ace04b3684290b287745de3260e4072e3527501bf62472057c4c521533678b2529b7d0c2dca93d0ca3854e29d82443a78d5c4061
 
 prepare() {
   mkdir cd $srcdir/${_pkgname%-$_pkgflag}-$pkgver/build
@@ -67,12 +68,13 @@ prepare() {
 build() {
   cd $srcdir/${_pkgname%-$_pkgflag}-$pkgver/build
 
-  [[ $CARCH != x86_64 ]] && DSUPPORT_SSE2_BUILD='-DSUPPORT_SSE2_BUILD=OFF'
+  [[ $CARCH == i686 ]] && DSUPPORT_SSE2_BUILD='-DSUPPORT_SSE2_BUILD=OFF'
 
   setarch $CARCH cmake ..\
     -DCMAKE_BUILD_TYPE=Release\
     -DCMAKE_INSTALL_PREFIX=/usr\
     -DOPENIMAGEIO_ROOT_DIR=/usr\
+    -DOPENJPEG_INCLUDE_DIR=/usr/include/openjpeg-$_jpgver\
     -DPYTHON_INCLUDE_DIRS=/usr/include/python${_pyver}m\
     -DPYTHON_LIBPATH=/usr/lib\
     -DPYTHON_LIBRARY=python${_pyver}m\
@@ -85,7 +87,7 @@ build() {
     -DWITH_CYCLES_OSL=ON\
     -DWITH_FFTW3=ON\
     -DWITH_GAMEENGINE=ON\
-    -DWITH_IMAGE_REDCODE=OFF\
+    -DWITH_IMAGE_REDCODE=ON\
     -DWITH_INSTALL_PORTABLE=OFF\
     -DWITH_JACK=ON\
     -DWITH_MOD_OCEANSIM=ON\
diff --git a/libre/claws-mail-libre/PKGBUILD b/libre/claws-mail-libre/PKGBUILD
index ee7019130..e37ffe283 100644
--- a/libre/claws-mail-libre/PKGBUILD
+++ b/libre/claws-mail-libre/PKGBUILD
@@ -2,95 +2,76 @@
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
-pkgbase=claws-mail
 pkgname=claws-mail-libre
-pkgflag=-libre
-pkgver=3.9.0
-pkgrel=2
+_pkgflag=libre
+_pkgname=${pkgname%-$_pkgflag}
+pkgver=3.9.1
+pkgrel=3
 pkgdesc='A GTK+ based e-mail client, without nonfree PalmOS handheld devices support'
-arch=(
-  i686
-  x86_64
-  mips64el
-)
-license=GPL3
-url="http://www.$pkgbase.org"
-depends=(
-  db
-  dbus-glib
-  desktop-file-utils
-  enchant
-  gnutls
-  gpgme
-  gtk2
-  hicolor-icon-theme
-  'libetpan>=1.1'
-  libsm
-  startup-notification
-)
-makedepends=(
-  bogofilter
-  compface
-  spamassassin
-)
-[ "$CARCH" != "mips64el" ] && makedepends+=(valgrind)
-optdepends=(
-  'python2:           needed for some tools'
-  'perl:              needed for some tools'
-  'spamassassin:      adds support for spamfiltering'
-  'bogofilter:        adds support for spamfiltering'
-)
-provides=(
-  claws
-  $pkgbase=$pkgver
-)
-conflicts=(
-  $pkgbase
-)
-replaces=(
-  $pkgbase
-  sylpheed-claws
-)
-options=(
-  '!libtool'
-)
-install=$pkgbase.install
-source=(
-  http://downloads.sourceforge.net/sourceforge/sylpheed-claws/$pkgbase-$pkgver.tar.bz2
-)
-md5sums=(
-  4c5ac7b21f0ed17d0f6404124c2229a4
-)
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL3')
+url="http://www.$_pkgname.org"
+depends=('gtk2' 'gnutls' 'startup-notification' 'enchant'
+         'gpgme' 'libetpan>=1.1' 'libsm' 'db' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils')
+makedepends=('compface' 'spamassassin' 'bogofilter' 'valgrind' 
+             # dependencies for plugins
+             'libsoup' 'libgdata' 'webkitgtk2' 'libnotify' 'libcanberra' 'poppler-glib' 'pygtk') 
+             #'libchamplain' needed for geolocation plugin, disabled for now - most time it's not compatible with current gnome releases
+optdepends=('python2:           needed for some tools and python plugin'
+            'perl:              needed for some tools and perl plugin'
+            'spamassassin:      adds support for spamfiltering'
+            'bogofilter:        adds support for spamfiltering'
+            'libnotify:         for notification plugin'
+            'libcanberra:       for notification plugin'
+            'dbus:              for notification plugin'
+            'libxml2:           for gtkhtml2_viewer and rssyl plugins'
+            'curl:              for gtkhtml2_viewer, vcalendar, rssyl and spamreport plugins'
+            'libarchive:        for archive plugin and various other plugins'
+            'libytnef:          for tnef_parse plugin'
+            'webkitgtk2:        for the fancy webkit html plugin'
+            'libsoup:           for the fancy webkit html plugin'
+	        'libgdata:          for gdata plugin'
+	        'poppler-glib:      for pdf viewer plugin'
+	        'ghostscript:       for pdf viewer plugin')
+replaces=("$_pkgname" "sylpheed-claws" "$_pkgname-extra-plugins")
+conflicts=("$_pkgname" "$_pkgname-extra-plugins")
+provides=("$_pkgname=$pkgver" 'claws')
+options=(!libtool)
+install=$_pkgname.install
+source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/$_pkgname-$pkgver.tar.bz2{,.asc})
+md5sums=('8adc734912ff1b83545cb12850100473'
+         'SKIP')
 
 build() {
-  cd $srcdir/$pkgbase-$pkgver
+  cd $srcdir/$_pkgname-$pkgver
 
+  # fixes for python2
+  export PYTHON="/usr/bin/python2"
   sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py
+  sed -i 's:python -c:python2 -c:g' configure
 
-  ./configure --prefix=/usr\
-    --disable-dillo-viewer-plugin\
-    --disable-static\
-    --enable-bogofilter-plugin\
-    --enable-crash-dialog\
-    --enable-enchant\
-    --enable-gnutls\
-    --enable-jpilot\
-    --enable-ldap\
-    --enable-pgpmime-plugin\
-    --enable-spamassassin-plugin
-
-  make
+  setarch $CARCH ./configure --prefix=/usr --disable-static \
+    --enable-enchant \
+    --enable-gnutls \
+    --enable-ldap \
+    --enable-crash-dialog \
+    --enable-pgpmime-plugin \
+    --enable-spamassassin-plugin \
+    --enable-bogofilter-plugin \
+    --enable-jpilot \
+    #--help
+  setarch $CARCH make
 }
 
 package() {
-  cd $srcdir/$pkgbase-$pkgver
-  make DESTDIR=$pkgdir install
+  cd $srcdir/$_pkgname-$pkgver
+  setarch $CARCH make DESTDIR=$pkgdir install
 
   # build and install extra tools
   cd tools
-  make
+  setarch $CARCH make
    # all executables and .conf files ; only top directory
   find -maxdepth 1 -type f -and -perm /111 -or -name '*.conf' | while read i ; do
-    install -D -m755 $i $pkgdir/usr/lib/$pkgbase/tools/$i
+    install -D -m755 $i $pkgdir/usr/lib/$_pkgname/tools/$i
   done
 }
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/cluster-glue/PKGBUILD b/pcr/cluster-glue/PKGBUILD
new file mode 100644
index 000000000..89b0af8ee
--- /dev/null
+++ b/pcr/cluster-glue/PKGBUILD
@@ -0,0 +1,160 @@
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+
+pkgname=cluster-glue
+_pkgname1=${pkgname::7}
+_pkgname2=${pkgname:8}
+_pkgname=${_pkgname1^}_${_pkgname2^}
+_grpname=linux-ha
+pkgver=1.0.11
+pkgrel=8
+pkgdesc='Set of libraries, tools and utilities suitable for the Heartbeat/Pacemaker cluster stack'
+arch=(
+  i686
+  x86_64
+  mips64el
+)
+url=http://$_grpname.org/wiki/$_pkgname
+license=(
+  GPL2
+  LGPL2.1
+)
+group=$_grpname
+depends=(
+  curl
+  dbus-glib
+  glib2
+  libaio
+  libesmtp
+  libltdl
+  libnet
+  libxml2
+  net-snmp
+  openhpi
+  #openipmi
+  python
+  util-linux
+  #vacm
+)
+optdepends=(
+  net-tools
+  openssh
+)
+makedepends=(
+  help2man
+  libxslt
+  lynx
+  net-tools
+  openssh
+  valgrind
+  w3m
+)
+provides=ha-$_pkgname2
+conflicts=ha-$_pkgname2
+replaces=ha-$_pkgname2
+install=$pkgname.install
+source=http://hg.$_grpname.org/$_pkgname2/archive/$_pkgname2-$pkgver.tar.bz2
+sha512sums=35ac8ac555c39f24c11e3a768cc50eba051fe617edf4cdc0429dac73f45a472f144cfe6ec5faff575606f2b04ff76a2f732556d848b61410c2683d93ba928413
+
+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 -rl INCLUDES . | grep Makefile.am)
+  sed -i 's|bin/sh|usr/bin/bash|;
+         ' $(grep -rl bin/sh .)
+  sed -i 's|usr/sbin|usr/bin|;
+         ' $(grep -rl usr/bin .)
+  sed -i 's| /bin| /usr/bin|;
+         ' $(grep -rl ' /bin' .)
+  sed -i 's| /sbin| /usr/bin|;
+         ' $(grep -rl ' /sbin' .)
+  sed -i 's|/var/lock|/run/lock|;
+         ' $(grep -rl /var/lock .)
+  sed -i 's|var/run|run|;
+         ' $(grep -rl var/run)
+  sed -i 's|Open Source|Free Software|;
+         ' $(grep -rl 'Open Source' .)
+  sed -i 's|opensource|freesoftware|;
+         ' $(grep -rl 'opensource' .)
+  sed -i '/Solaris, FreeBSD and Linux/ s|Linux|GNU/Linux|;
+          /sysDescr.0 = STRING: Linux/ s|Linux|GNU/Linux|;
+          /works only on Linux./ s|Linux|GNU/Linux|;
+          /UNIX, Linux/ s|Linux|GNU/Linux|;
+          /Logging Daemon for High-Availability Linux/ s|Linux|GNU/Linux|;
+          /This is what the Linux/ s|Linux|GNU/Linux|;
+          /Compiling for Linux platform/ s|Linux|GNU/Linux|;
+          /Like Linux/ s|Linux|GNU/Linux|;
+          /(e.g. Linux)/ s|Linux|GNU/Linux|;
+          /Linux, Solaris/ s|Linux|GNU/Linux|;
+          /Linux and Compaq Tru64 Unix/ s|Linux|GNU/Linux|;
+         ' $(grep -rl Linux .)
+}
+
+build() {
+  cd $srcdir/Reusable-${_pkgname1^}-Components-$_pkgname2--$_pkgname2-$pkgver
+  setarch $CARCH ./autogen.sh
+  setarch $CARCH ./configure --prefix=/usr\
+    --disable-ansi\
+    --disable-fatal-warnings\
+    --enable-doc\
+    --enable-libnet\
+    --enable-upstart\
+    --libdir=/usr/lib\
+    --localstatedir=/var\
+    --sbindir=/usr/bin\
+    --sysconfdir=/etc\
+    --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
+
+  rm $pkgdir/etc/rc.d/logd && rmdir $pkgdir/etc{/rc.d,}
+
+  install -d $pkgdir/usr/lib/systemd/system
+  echo '[Unit]'                                   >  $pkgdir/usr/lib/systemd/system/ha_log.service
+  echo 'Description=Startup script logd service'  >> $pkgdir/usr/lib/systemd/system/ha_log.service
+  echo 'Requires=network.target remote-fs.target' >> $pkgdir/usr/lib/systemd/system/ha_log.service
+  echo ''                                         >> $pkgdir/usr/lib/systemd/system/ha_log.service
+  echo '[Service]'                                >> $pkgdir/usr/lib/systemd/system/ha_log.service
+  echo 'Type=forking'                             >> $pkgdir/usr/lib/systemd/system/ha_log.service
+  echo 'ExecStart=/usr/lib/heartbeat/ha_logd'     >> $pkgdir/usr/lib/systemd/system/ha_log.service
+  echo ''                                         >> $pkgdir/usr/lib/systemd/system/ha_log.service
+  echo '[Install]'                                >> $pkgdir/usr/lib/systemd/system/ha_log.service
+  echo 'WantedBy=multi-user.target'               >> $pkgdir/usr/lib/systemd/system/ha_log.service
+
+  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 05e2160d3..05e2160d3 100644
--- a/pcr/ha-glue/ha-glue.install
+++ b/pcr/cluster-glue/cluster-glue.install
diff --git a/pcr/ha-glue/PKGBUILD b/pcr/ha-glue/PKGBUILD
deleted file mode 100644
index ab23a80d2..000000000
--- a/pcr/ha-glue/PKGBUILD
+++ /dev/null
@@ -1,115 +0,0 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-
-pkgname=ha-glue
-_pkgname=${pkgname:3}
-pkgver=1.0.11
-pkgrel=7
-pkgdesc='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
-  dbus-glib
-  glib2
-  libaio
-  libesmtp
-  libnet
-  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|;
-          s| -O0||;
-          s|AM_INIT_AUTOMAKE($PACKAGE_NAME, $PACKAGE_VERSION)|AM_INIT_AUTOMAKE|;
-         ' configure.ac
-  sed -i 's|INCLUDES|AM_CPPFLAGS|;
-         ' {lib/{clplumbing,lrm,pils,plugins/{InterfaceMgr,compress,lrm,stonith},stonith},logd,lrm/{admin,lrmd,test},replace}/Makefile.am
-}
-
-build() {
-  cd $srcdir/Reusable-Cluster-Components-$_pkgname--$_pkgname-$pkgver
-  setarch $CARCH ./autogen.sh
-  setarch $CARCH ./configure --prefix=/usr\
-    --disable-fatal-warnings\
-    --enable-static=no\
-    --enable-upstart\
-    --libdir=/usr/lib\
-    --localstatedir=/var\
-    --sysconfdir=/etc\
-    --with-daemon-group=haclient\
-    --with-daemon-user=hacluster\
-    --with-ocf-root=/usr/lib/ocf
-  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/openhpi/PKGBUILD b/pcr/openhpi/PKGBUILD
new file mode 100644
index 000000000..6389ff39c
--- /dev/null
+++ b/pcr/openhpi/PKGBUILD
@@ -0,0 +1,82 @@
+# Maintainer: Márcio Silva <coadde@lavabit.com>
+
+pkgname=openhpi
+pkgver=3.2.0
+pkgrel=1
+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
+)
+source=http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
+sha512sums=5a54ccc2279b3a608e2842dd3b4f01d7d483182ecd33d1d33186247cea15b62f1e0aea4eea1294cd6c3959a25424dc322cca73e516f4c8fd9d3a41a949d087ab
+
+prepare() {
+  cd $srcdir/$pkgname-$pkgver
+  sed -i 's|bin/sh|usr/bin/bash|;
+         ' $(grep -rl bin/sh)
+  sed -i 's|usr/sbin|usr/bin|;
+         ' $(grep -rl usr/bin)
+  sed -i 's| /bin| /usr/bin|;
+         ' $(grep -rl ' /bin')
+  sed -i 's| /sbin| /usr/bin|;
+         ' $(grep -rl ' /sbin')
+  sed -i 's|var/lock|run/lock|;
+         ' $(grep -rl var/lock)
+  sed -i 's|var/run|run|;
+         ' $(grep -rl var/run)
+  sed -i '/Like Linux/ s|Linux|GNU/Linux|;
+          /Linux and Compaq Tru64 Unix/ s|Linux|GNU/Linux|;
+          /Linux distribution/ s|Linux|GNU/Linux|;
+          /Linux software/ s|Linux|GNU/Linux|;
+         ' $(grep -rl Linux)
+}
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  setarch $CARCH ./configure --prefix=/usr\
+    --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..1dcb359ee
--- /dev/null
+++ b/pcr/openipmi/PKGBUILD
@@ -0,0 +1,56 @@
+# 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=1
+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
+  sed -i '/on Linux/ s|Linux|GNU/Linux|' $(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/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/~mtjm/python2-postfix-policyd-spf/PKGBUILD b/pcr/python2-postfix-policyd-spf/PKGBUILD
index 237b6c9bd..f5b96f752 100644
--- a/~mtjm/python2-postfix-policyd-spf/PKGBUILD
+++ b/pcr/python2-postfix-policyd-spf/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Samed Beyribey <ras0ir@eventualis.org>
 pkgname=python2-postfix-policyd-spf
 _pkgname=pypolicyd-spf
-pkgver=0.8.1
+pkgver=1.1.2
 pkgrel=1
 pkgdesc="Python2 Postfix Sender Policy Framework (SPF) filter"
 arch=('any')
@@ -12,14 +12,17 @@ license=('GPL')
 depends=('postfix' 'python2-pyspf' 'python2')
 conflicts=('python-postfix-policyd-spf')
 options=(!emptydirs)
-source=(http://launchpad.net/pypolicyd-spf/0.8/$pkgver/+download/$_pkgname-$pkgver.tar.gz)
-md5sums=('a37c209e88e4dc419f62ae7c6b52f0e7')
- 
+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 || return 1
-  python2 setup.py install --root=$pkgdir/ --optimize=1 || return 1
-  install -m644 policyd-spf.conf.commented $pkgdir/etc/python-policyd-spf || return 1
+  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/~mtjm/python2-pydns/PKGBUILD b/pcr/python2-pydns/PKGBUILD
index cf5f4b388..cf5f4b388 100644
--- a/~mtjm/python2-pydns/PKGBUILD
+++ b/pcr/python2-pydns/PKGBUILD
diff --git a/~mtjm/python2-pyspf/PKGBUILD b/pcr/python2-pyspf/PKGBUILD
index abb3bfa5f..abb3bfa5f 100644
--- a/~mtjm/python2-pyspf/PKGBUILD
+++ b/pcr/python2-pyspf/PKGBUILD
diff --git a/~mtjm/ttf-beteckna/PKGBUILD b/pcr/ttf-beteckna/PKGBUILD
index ff338e0d4..3bbe41397 100644
--- a/~mtjm/ttf-beteckna/PKGBUILD
+++ b/pcr/ttf-beteckna/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=ttf-beteckna
 pkgver=0.4
-pkgrel=1
+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/"
diff --git a/~mtjm/ttf-beteckna/ttf.install b/pcr/ttf-beteckna/ttf.install
index 33b7d6549..33b7d6549 100644
--- a/~mtjm/ttf-beteckna/ttf.install
+++ b/pcr/ttf-beteckna/ttf.install
diff --git a/~mtjm/python-coverage/LICENSE b/~mtjm/python-coverage/LICENSE
deleted file mode 100644
index 304031cb6..000000000
--- a/~mtjm/python-coverage/LICENSE
+++ /dev/null
@@ -1,29 +0,0 @@
-# COPYRIGHT AND LICENSE
-#
-# Copyright 2001 Gareth Rees.  All rights reserved.
-# Copyright 2004-2010 Ned Batchelder.  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 COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# HOLDERS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-# TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-# DAMAGE.
diff --git a/~mtjm/python-coverage/PKGBUILD b/~mtjm/python-coverage/PKGBUILD
deleted file mode 100644
index f9acc0d94..000000000
--- a/~mtjm/python-coverage/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# Maintainer: Michał Masłowski <mtjm@mtjm.eu>
-
-pkgname=(python-coverage python2-coverage)
-pkgver=3.5.1
-pkgrel=1
-pkgdesc="Code coverage measurement for Python"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://nedbatchelder.com/code/coverage/"
-license=('BSD')
-makedepends=('python' 'python2' 'python-distribute' 'python2-distribute')
-provides=()
-conflicts=()
-replaces=()
-backup=()
-options=(!emptydirs)
-install=
-source=("http://pypi.python.org/packages/source/c/coverage/coverage-${pkgver}.tar.gz" LICENSE)
-md5sums=('410d4c8155a4dab222f2bc51212d4a24'
-         'f86a7dcb9a1bc636cdbcc19a96d19b2c')
-
-# Tests are not run, since upstream removes them from release tarballs.
-
-build() {
-  cd $srcdir
-  cp -r coverage-$pkgver build-py2k
-  cp -r coverage-$pkgver build-py3k
-  cd build-py2k
-  python2 setup.py build
-  cd ../build-py3k
-  python setup.py build
-}
-
-package_python-coverage() {
-  depends=('python' 'python-distribute')
-  cd "$srcdir/build-py3k"
-  python setup.py install --root="$pkgdir/" --optimize=1
-  install -D -m644 $srcdir/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-package_python2-coverage() {
-  depends=('python2' 'python2-distribute')
-  cd "$srcdir/build-py2k"
-  python2 setup.py install --root="$pkgdir/" --optimize=1
-  # Name the script differently.
-  mv $pkgdir/usr/bin/coverage $pkgdir/usr/bin/coverage2
-  install -D -m644 $srcdir/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/~mtjm/python2-pyflakes/PKGBUILD b/~mtjm/python2-pyflakes/PKGBUILD
deleted file mode 100644
index 397c487b7..000000000
--- a/~mtjm/python2-pyflakes/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 64234 2012-02-11 00:28:07Z arodseth $
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: TDY <tdy@gmx.com>
-# Contributor: Tiago Pierezan Camargo <tcamargo@gmail.com>
-
-pkgname=python2-pyflakes
-pkgver=0.5.0
-pkgrel=1
-pkgdesc='A lint-like tool for Python to identify common errors quickly without executing code'
-arch=('any')
-url='http://pypi.python.org/pypi/pyflakes'
-license=('custom:MIT')
-depends=('python2')
-provides=('pyflakes')
-conflicts=('pyflakes')
-replaces=('pyflakes')
-source=("http://pypi.python.org/packages/source/p/pyflakes/pyflakes-${pkgver}.tar.gz")
-md5sums=('568dab27c42e5822787aa8a603898672')
-
-build() {
-  cd pyflakes-${pkgver}
-
-  python2 setup.py build
-}
-
-package() {
-  cd pyflakes-${pkgver}
-
-  python2 setup.py install --prefix=/usr --root=${pkgdir} --optimize=1
-
-  install -D -m644 LICENSE \
-    ${pkgdir}/usr/share/licenses/pyflakes/LICENSE
-}