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

5 files changed, 41 insertions, 28 deletions

diff --git a/pcr/monkeysign/PKGBUILD b/pcr/monkeysign/PKGBUILD
index 2e4ab1f3f..360d8a4a8 100644
--- a/pcr/monkeysign/PKGBUILD
+++ b/pcr/monkeysign/PKGBUILD
@@ -1,19 +1,22 @@
 # Contributor: fauno <fauno@kiwwwi.com.ar>
+# Contributor: max-k
 pkgname=monkeysign
-pkgver=1.0
+pkgver=1.1
 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')
+depends=('python2-qrencode-pillow' 'gtk2' 'pygtk' 'zbar')
+makedepends=('python2-setuptools' 'python2-docutils')
 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')
+# http://cdn.debian.net/debian/pool/main/m/monkeysign/monkeysign_1.1.dsc
+sha1sums=('b236849aa84487608e5cb747d1abb12325433279')
+sha256sums=('1229c63c9b649b35a156ab69c7e8ef47ff03817c94ce8138107832117ee5fa6d')
 
 build() {
     cd "${pkgname}-${pkgver}"
+    sed -i 's/rst2s5/rst2s52/' monkeysign/documentation.py
     python2 setup.py build
 }
 
@@ -21,4 +24,3 @@ package() {
     cd "${pkgname}-${pkgver}"
     python2 setup.py install --root="${pkgdir}" --prefix="/usr" --optimize=1
 }
-
diff --git a/pcr/python2-potr/PKGBUILD b/pcr/python2-potr/PKGBUILD
index 39613ad95..684912283 100644
--- a/pcr/python2-potr/PKGBUILD
+++ b/pcr/python2-potr/PKGBUILD
@@ -1,28 +1,34 @@
-# Maintainer: Michael Düll <mail@akurei.me> PGP-Key: AAAEE882
+# Maintainer: Michael Düll <mail@akurei.me>
 
 pkgname=python2-potr
-pkgver=1.0.0beta6
-pkgrel=3
-pkgdesc="This is a pure Python OTR implementation; it does not bind to libotr."
+pkgver=1.0.0
+pkgrel=4
+pkgdesc="This is a pure Python2 OTR implementation; it does not bind to libotr."
 arch=(any)
 url="https://github.com/afflux/pure-python-otr"
 license=('LGPL')
 depends=('python2' 'python2-crypto')
 conflicts=('python-potr-git' 'python-potr')
 replaces=('python-potr')
-options=(!emptydirs)
-source=("https://github.com/afflux/pure-python-otr/tarball/${pkgver}")
+#options=(!emptydirs)
+source=("https://github.com/python-otr/pure-python-otr/archive/${pkgver}.tar.gz")
+sha512sums=('46b0dab24cab68e695661c5982ba25823e39540ecef7e90693898342f44e52afa549d8708166ebef81474aee3f846d8b76690e3061fa1bc65147e804751f8f48')
 
 PYTHON=`which python2`
 
-build() {
-  cd $srcdir/afflux*
+#build() {
+#  cd $srcdir/afflux*
+#  set_python2
+#  $PYTHON ./setup.py build
+#}
+
+prepare() {
+  cd $srcdir/pure-python-otr-${pkgver}
   set_python2
-  $PYTHON ./setup.py build
 }
 
 package() {
-  cd $srcdir/afflux*
+  cd $srcdir/pure-python-otr-${pkgver}
   $PYTHON ./setup.py install --root=$pkgdir/
 }
 
@@ -36,4 +42,3 @@ set_python2() {
 
 
 # vim:set ts=2 sw=2 et:
-sha512sums=('323ad31e782409b7bd93539dfc0088de8b114075b88de81123b732aff609fbb2a2c06221c52266225ce54e20e9856b25759bae84c93244a1258ccba3825c8b1c')
diff --git a/pcr/radicale/PKGBUILD b/pcr/radicale/PKGBUILD
index b4f76f6ab..879cda8d4 100644
--- a/pcr/radicale/PKGBUILD
+++ b/pcr/radicale/PKGBUILD
@@ -1,23 +1,25 @@
 # Maintainer: Guillaume Bouchard <guillaume.bouchard@liris.cnrs.fr>
 pkgname=radicale
-pkgver=0.7.1
-pkgrel=2
+pkgver=0.8
+pkgrel=1
 pkgdesc="A Simple Calendar Server"
 arch=any
 url="http://www.radicale.org/"
 license=('GPL3')
-depends=('python')
+depends=('python2')
 backup=('etc/radicale/config')
 source=(http://pypi.python.org/packages/source/R/Radicale/Radicale-$pkgver.tar.gz
 	radicale.service)
+install=radicale.install
 
 package() {
   cd "$srcdir/Radicale-$pkgver"
-  python setup.py install --prefix=/usr --root="$pkgdir" || return 1
+  python2 setup.py install --prefix=/usr --root="$pkgdir"
 
   install -D "$srcdir/Radicale-$pkgver/config" "$pkgdir/etc/radicale/config"
   install -m744 -D "$srcdir/radicale.service" "$pkgdir/usr/lib/systemd/system/radicale.service"
 }
-  
-md5sums=('ab1167b1ee713a7a58d843c5921f3327'
-         'dbdfedb46af4ceed0ad0db3441b5a266')
+sha1sums=('05e07d8ff851d15bcdb7274680ee3aceeebe01c3'
+          'c8ef31d70828b302ad709d7db5557c05283efb47')
+sha256sums=('e8c0df5239c22f2687a09eca7d53c318706648aff72b620849ed3f7540bc1941'
+            '8a56209f42de337a5bd12f9ce4de1719228dbeba9743e9ec454af3685a03b764')
diff --git a/pcr/radicale/radicale.service b/pcr/radicale/radicale.service
index 293cad6e2..a159b772e 100644
--- a/pcr/radicale/radicale.service
+++ b/pcr/radicale/radicale.service
@@ -5,6 +5,8 @@ After=network.target
 [Service]
 ExecStart=/usr/bin/radicale
 ExecStop=/bin/kill -HUP $MAINPID
+User=cal
+Group=cal
 
 [Install]
 WantedBy=multi-user.target
diff --git a/social/seeks/PKGBUILD b/social/seeks/PKGBUILD
index f686a2fc9..57041355f 100644
--- a/social/seeks/PKGBUILD
+++ b/social/seeks/PKGBUILD
@@ -1,9 +1,7 @@
-# Maintainer: Kete < kete at ninthfloor dot org >
-
 pkgname=seeks
 pkgver=0.4.1
 pkgrel=5
-pkgdesc="A social decentralized internet overlay for collaborative searches"
+pkgdesc="Social decentralized internet overlay for collaborative searches"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.seeks-project.info/site/"
 license=('AGPL3' 'LGPL' 'BSD')
@@ -20,10 +18,14 @@ source=("http://downloads.sourceforge.net/project/${pkgname}/hippy/${pkgname}-${
 	'seeks.logrotate')
 install=seeks.install
 
-build() {
+prepare() {
   cd  "$srcdir/$pkgname-$pkgver"
   # replace <cxflann.h> by <cv.h>
   patch -p1 -i "$srcdir/img_websearch.patch"
+}
+
+build() {
+  cd  "$srcdir/$pkgname-$pkgver"
 
   # linking issue with --as-needed linker flag, Cli not building with RC2
   LDFLAGS="-Wl,--no-as-needed" \