[arch-commits] Commit in (3 files)

[Daniel M. Capella]

    Date: Thursday, December 24, 2020 @ 02:53:29
  Author: polyzen
Revision: 786076

khal, khard, todoman: Fix configobj imports

Modified:
  khal/trunk/PKGBUILD
  khard/trunk/PKGBUILD
  todoman/trunk/PKGBUILD

------------------------+
 khal/trunk/PKGBUILD    |    9 ++++++++-
 khard/trunk/PKGBUILD   |    8 +++++++-
 todoman/trunk/PKGBUILD |    4 +++-
 3 files changed, 18 insertions(+), 3 deletions(-)

Modified: khal/trunk/PKGBUILD
===================================================================
--- khal/trunk/PKGBUILD	2020-12-24 02:53:27 UTC (rev 786075)
+++ khal/trunk/PKGBUILD	2020-12-24 02:53:29 UTC (rev 786076)
@@ -1,4 +1,5 @@
 # Maintainer: David Runge <dvzrv at archlinux.org>
+# Maintainer: Daniel M. Capella <polyzen at archlinux.org>
 # Contributor: eolianoe <eolianoe [at] googlemail [dot] com>
 # Contributor: Hugo Osvaldo Barrera <hugo at barrera.io>
 # Contributor: Thomas Weißschuh <thomas t-8ch de>
@@ -8,7 +9,7 @@
 _name=khal
 pkgname=khal
 pkgver=0.10.2
-pkgrel=2
+pkgrel=3
 pkgdesc='CLI calendar application build around CalDAV'
 arch=('any')
 url="https://lostpackets.de/khal/"
@@ -24,6 +25,12 @@
 sha512sums=('e15449b73175190f02b6fe5774a8feef8a5390966da3836624c94a044d146cc6e8a73985d991042fbb617f736c6759ded387a65292529e71f5b2f34bc80a686e')
 b2sums=('0c7c4ab1234ebe90ef9ad8291f2a0087a3f6a60d25f5426445eedadb25f236b3598dacc051e959a108ad472efc56628bf7ba11ed714c885d956f1a8f905029ca')
 
+prepare() {
+  cd "${pkgname}-${pkgver}"
+  sed -i 's/from validate/from configobj.validate/' khal/settings/{settings.py,utils.py}
+  sed -i 's/import validate/import configobj.validate as validate/' doc/source/conf.py
+}
+
 build() {
   cd "${pkgname}-${pkgver}"
   python setup.py build

Modified: khard/trunk/PKGBUILD
===================================================================
--- khard/trunk/PKGBUILD	2020-12-24 02:53:27 UTC (rev 786075)
+++ khard/trunk/PKGBUILD	2020-12-24 02:53:29 UTC (rev 786076)
@@ -1,8 +1,9 @@
 # Maintainer: David Runge <dvzrv at archlinux.org>
+# Maintainer: Daniel M. Capella <polyzen at archlinux.org>
 
 pkgname=khard
 pkgver=0.17.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Console CardDAV client"
 arch=('any')
 url="https://github.com/scheibler/khard"
@@ -18,6 +19,11 @@
 sha512sums=('9cb936aeaa327b9837488a752906bf603429ca0c7240703829220119049f5f62e84f7e4c90bb81799307fe446c3aa47fe6ee4112c276b6bb329c959be438ba25')
 b2sums=('488e1df70212c856d8dfa43955e681344fb1a257d765c81820444f6435d39aec782da9d01edeeaac0b9a87412db680fde368c39c74faa82b0eff2d7a0a2dbc6b')
 
+prepare() {
+  cd "$pkgname-$pkgver"
+  sed -i 's/import validate/import configobj.validate as validate/' khard/config.py
+}
+
 build() {
   cd "$pkgname-$pkgver"
   python setup.py build

Modified: todoman/trunk/PKGBUILD
===================================================================
--- todoman/trunk/PKGBUILD	2020-12-24 02:53:27 UTC (rev 786075)
+++ todoman/trunk/PKGBUILD	2020-12-24 02:53:29 UTC (rev 786076)
@@ -3,7 +3,7 @@
 
 pkgname=todoman
 pkgver=3.9.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A simple, standards-based, cli todo (aka: task) manager"
 arch=('any')
 url="https://github.com/pimutils/todoman"
@@ -26,6 +26,8 @@
   cd "$pkgname-$pkgver"
   # remove interfering options to pytest
   sed -e '/addopts/d' -i setup.cfg
+  sed -i 's/from validate/from configobj.validate/g' todoman/configuration.py
+  sed -i 's/import validate/import configobj.validate as validate/' docs/source/conf.py
 }
 
 build() {