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

Conflicts:
	nonprism/claws-mail-libre-nonprism/PKGBUILD

6 files changed, 132 insertions, 4 deletions

diff --git a/pcr/monkeysign/PKGBUILD b/pcr/monkeysign/PKGBUILD
new file mode 100644
index 000000000..2e4ab1f3f
--- /dev/null
+++ b/pcr/monkeysign/PKGBUILD
@@ -0,0 +1,24 @@
+# Contributor: fauno <fauno@kiwwwi.com.ar>
+pkgname=monkeysign
+pkgver=1.0
+pkgrel=1
+pkgdesc="OpenPGP Key Exchange for Humans"
+arch=('any')
+url="http://web.monkeysphere.info/monkeysign/"
+license=('GPL3')
+depends=('python2-setuptools' 'python2-qrencode' 'gtk2' 'pygtk' 'zbar' 'python2-imaging')
+source=(http://cdn.debian.net/debian/pool/main/m/${pkgname}/${pkgname}_${pkgver}.tar.gz)
+# http://cdn.debian.net/debian/pool/main/m/monkeysign/monkeysign_1.0.dsc
+sha1sums=('28e29beae7fed3c3deba236cbe8879cab5eeb4e8')
+sha256sums=('944fc4d0915236bf72390bd2dc2f5445cfb70033df438b91b1af38bd0ff9fd46')
+
+build() {
+    cd "${pkgname}-${pkgver}"
+    python2 setup.py build
+}
+
+package() {
+    cd "${pkgname}-${pkgver}"
+    python2 setup.py install --root="${pkgdir}" --prefix="/usr" --optimize=1
+}
+
diff --git a/pcr/monkeysphere/PKGBUILD b/pcr/monkeysphere/PKGBUILD
index f83e05741..070de2448 100644
--- a/pcr/monkeysphere/PKGBUILD
+++ b/pcr/monkeysphere/PKGBUILD
@@ -3,8 +3,8 @@
 # Contributor: Olivier Mehani <shtrom-arch@ssji.net>
 # $Id: PKGBUILD 264 2010-11-10 00:57:53Z shtrom $
 pkgname=monkeysphere
-pkgver=0.35
-pkgrel=5
+pkgver=0.36
+pkgrel=1
 pkgdesc="Leverage the OpenPGP web of trust for OpenSSH and Web authentication"
 arch=('any')
 url="http://web.monkeysphere.info/"
@@ -32,5 +32,3 @@ package() {
   make DESTDIR="$pkgdir/" install
   mkdir -p $pkgdir/var/lib/monkeysphere
 } 
-md5sums=('481ac14c9fdef0ccd1944c593bd4f517'
-         'a8bd35dc7dd58b5952beeecafe5045a7')
diff --git a/pcr/python2-qrencode/PKGBUILD b/pcr/python2-qrencode/PKGBUILD
new file mode 100644
index 000000000..9661db1bc
--- /dev/null
+++ b/pcr/python2-qrencode/PKGBUILD
@@ -0,0 +1,29 @@
+# Maintainer: ValHue <vhuelamo at gmail dot com>
+# https://github.com/ValHue/AUR-PKGBUILDs
+#
+# Contributor: sevkin <vsevolod at balashov dot name>
+
+_python=python2
+_name=qrencode
+pkgname="${_python}-${_name}"
+pkgver=1.01
+pkgrel=4
+pkgdesc="Encodes QR-codes."
+arch=('i686' 'x86_64')
+url="http://pypi.python.org/pypi/${_name}"
+license=('Apache')
+depends=("${_python}" 'qrencode')
+makedepends=('gcc')
+source=("http://pypi.python.org/packages/source/q/${_name}/${_name}-${pkgver}.tar.gz")
+md5sums=('5a1addd4d6e6412116fcfeb9661831a9')
+
+build() {
+    cd "${_name}-${pkgver}"
+    export PYTHON="/usr/bin/${_python}"
+    ${_python} setup.py build
+}
+
+package() {
+    cd "${_name}-${pkgver}"
+    ${_python} setup.py install --root="${pkgdir}" --prefix="/usr" --optimize=1
+}
diff --git a/pcr/tomb/tomb.install b/pcr/tomb/tomb.install
new file mode 100644
index 000000000..c1ee8b339
--- /dev/null
+++ b/pcr/tomb/tomb.install
@@ -0,0 +1,13 @@
+post_install() {
+  update-desktop-database -q
+  update-mime-database usr/share/mime
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
+
diff --git a/pcr/zbar/PKGBUILD b/pcr/zbar/PKGBUILD
new file mode 100644
index 000000000..120161a11
--- /dev/null
+++ b/pcr/zbar/PKGBUILD
@@ -0,0 +1,40 @@
+# Maintainer: Marti Raudsepp <marti@juffo.org>
+# Contributor: Radu Andries <admiral0@tuxfamily.org>
+# Contributor: Andy Weidenbaum <archbaum@gmail.com>
+
+pkgname=zbar
+pkgver=0.10
+pkgrel=3
+pkgdesc="Application and library for reading bar codes from various sources"
+arch=('i686' 'x86_64')
+url="http://zbar.sourceforge.net/"
+license=('LGPL')
+depends=('imagemagick' 'libxv')
+makedepends=('gtk2' 'qt4' 'pygtk' 'v4l-utils')
+source=("http://downloads.sourceforge.net/project/zbar/zbar/$pkgver/zbar-$pkgver.tar.bz2"
+        v4l1.patch)
+optdepends=('pygtk: python2 widget'
+            'gtk2: gtk2 widget'
+            'qt4: qt4 widget')
+
+prepare() {
+  cd "$srcdir/zbar-$pkgver"
+  patch -p1 < ${srcdir}/v4l1.patch
+}
+
+build() {
+  cd "$srcdir/zbar-$pkgver"
+
+  ./configure --prefix=/usr CFLAGS="$CFLAGS -DNDEBUG"
+
+  make
+}
+
+package() {
+  cd "$srcdir/zbar-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
+md5sums=('0fd61eb590ac1bab62a77913c8b086a5'
+         '284f11ca2a5e009744c4a1b9e92d6953')
diff --git a/pcr/zbar/v4l1.patch b/pcr/zbar/v4l1.patch
new file mode 100644
index 000000000..150b0e695
--- /dev/null
+++ b/pcr/zbar/v4l1.patch
@@ -0,0 +1,24 @@
+Thanks to Andy Weidenbaum <archbaum@gmail.com> for providing this patch!
+
+--- ./zbar/video/v4l1.c	2013-03-06 23:24:22.996336417 -0800
++++ ./zbar/video/v4l1.c	2013-03-06 23:29:29.789662369 -0800
+@@ -41,7 +41,7 @@
+ #ifdef HAVE_SYS_MMAN_H
+ # include <sys/mman.h>
+ #endif
+-#include <linux/videodev.h>
++#include <libv4l1-videodev.h>
+ 
+ #include "video.h"
+ #include "image.h"
+--- ./configure	2009-10-23 11:17:24.000000000 -0700
++++ ./configure	2013-03-06 23:47:33.902966990 -0800
+@@ -18709,7 +18709,7 @@
+ if test "x$enable_video" != "xno"; then
+   if test "x$win32" = "xno"; then
+ 
+-for ac_header in linux/videodev.h
++for ac_header in libv4l1-videodev.h
+ do
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then