some stuff i had hanging around

4 files changed, 39 insertions, 35 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/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/pcr/tomb/PKGBUILD b/pcr/tomb/PKGBUILD
index 66945cb41..2902f07bc 100644
--- a/pcr/tomb/PKGBUILD
+++ b/pcr/tomb/PKGBUILD
@@ -1,28 +1,27 @@
 ## PKGBUILD [bash]
 # Maintainer: nignux <nignux@freaknet.org>
+# Maintainer (Parabola): fauno <fauno@parabola.nu>
+# Contributor: BoySka
 
 pkgbase=tomb
-pkgname=(tomb python2-tomb tomb-gui)
+pkgname=(tomb tomb-kdf)
 pkgver=1.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Crypto Undertaker, simple tool to manage encrypted storage"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.dyne.org/software/tomb/"
 license=('GPL3')
-depends=('bc' 'cryptsetup' 'gnupg' 'sudo' 'zsh' 'steghide'
-         'dcfldd' 'wipe')
-makedepends=('python2-pyqt' 'python2-distribute')
 install=${pkgname}.install
-source=(https://files.dyne.org/tomb/releases/Tomb-${pkgver}.tar.gz{,.sha{,.asc}})
+source=(https://files.dyne.org/.xsend.php?file=tomb/releases/Tomb-1.4.tar.gz https://files.dyne.org/tomb/releases/Tomb-${pkgver}.tar.gz.sha{,.asc})
 # The first hash comes from the .sha file
 sha256sums=('2621ac6b9180321e69743dc899645449b2b958c6aa46e4b2601c2e89131bbf29'
-            'fc8b168f991d5b9c1135ceec6e55ac94f494ac4bed7e104e14c7f9ee787591e5'
+            'SKIP'
             'SKIP')
 
 build() {
-  cd ${srcdir}/Tomb-${pkgver}/extras/qt
+  cd ${srcdir}/Tomb-${pkgver}/extras/kdf
 
-  python2 setup.py build_ui
+  make
 }
 
 # The checks require root access
@@ -33,21 +32,20 @@ build() {
 
 package_tomb() {
   pkgdesc="Crypto Undertaker, simple tool to manage encrypted storage, from the hashes of the dyne:bolic nesting mechanism."
+  depends=('bc' 'cryptsetup' 'gnupg' 'sudo' 'zsh' 'wipe')
+  optdepends=(
+  'steghide: steganography'
+  'dcfldd: show nice progress during massive I/O'
+  )
+  arch=('any')
   cd ${srcdir}/Tomb-${pkgver}
-  make DESTDIR=${pkgdir} install
+  make DESTDIR=${pkgdir} PREFIX=/usr install
 }
 
-package_python2-tomb() {
-  pkgdesc="Crypto Undertaker library"
+package_tomb-kdf() {
+  pkgdesc="Crypto Undertaker extensions to improve password security"
+  depends=('libgcrypt')
 
-  cd ${srcdir}/Tomb-${pkgver}/extras/pytomb
-  python2 setup.py install --root="${pkgdir}/" --optimize=1
-}
-
-package_tomb-gui() {
-  pkgdesc="Crypto Undertaker GUI for open and create tombs"
-  depends=('python2-tomb' 'python2-pyqt')
-
-  cd ${srcdir}/Tomb-${pkgver}/extras/qt
-  python2 setup.py install --root="${pkgdir}/" --optimize=1
+  cd ${srcdir}/Tomb-${pkgver}/extras/kdf
+  make DESTDIR=${pkgdir} PREFIX=/usr install
 }