[arch-commits] Commit in notmuch/trunk (PKGBUILD)

[Maxim Baz]

    Date: Wednesday, July 29, 2020 @ 19:17:24
  Author: maximbaz
Revision: 665806

upgpkg: notmuch 0.30-1

Modified:
  notmuch/trunk/PKGBUILD

----------+
 PKGBUILD |   30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-29 18:50:08 UTC (rev 665805)
+++ PKGBUILD	2020-07-29 19:17:24 UTC (rev 665806)
@@ -1,4 +1,5 @@
 # Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
+# Maintainer: Maxim Baz <$pkgbase at maximbaz dot com>
 # Contributor: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: fauno <fauno at kiwwwi.com.ar>
 # Contributor: Olivier Ramonat <olivier at ramonat dot fr>
@@ -6,22 +7,16 @@
 
 pkgbase=notmuch
 pkgname=('notmuch' 'notmuch-vim' 'notmuch-mutt' 'notmuch-runtime')
-pkgver=0.29.3
-pkgrel=2
+pkgver=0.30
+pkgrel=1
 arch=('x86_64')
 url="https://notmuchmail.org/"
 license=('GPL3')
-makedepends=('python2' 'python' 'python-sphinx' 'emacs' 'gnupg' 'ruby' 'pkgconfig' 'xapian-core' 'gmime3' 'talloc')
+makedepends=('python' 'python-sphinx' 'python-cffi' 'emacs' 'gnupg' 'ruby' 'pkgconfig' 'xapian-core' 'gmime3' 'talloc')
 options=(!distcc !makeflags)
 source=("https://notmuchmail.org/releases/${pkgname}-${pkgver}.tar.xz")
-md5sums=('d2697458d1ae087ee385a9912db29c95')
+sha512sums=('a5c812eb141c293c61b5483eafd31d3e3ab19b2c84429a1558986c415d30ead4afa79db64b2672e9549a40f5eb4c69e54ea5ccccbeeaeb9c783051c3f965a65e')
 
-prepare(){
-    cp -dpr --no-preserve=ownership "$srcdir/${pkgname}-$pkgver"/bindings/python{,2}
-    find "$srcdir/${pkgname}-${pkgver}/bindings/python" -name '*.py' -exec sed -i -e '1s,python$,python3,' {} +
-    find "$srcdir/${pkgname}-${pkgver}/bindings/python2" -name '*.py' -exec sed -i -e '1s,python$,python2,' {} +
-}
-
 build() {
     cd "$srcdir/$pkgbase-$pkgver"
 
@@ -35,8 +30,8 @@
     cd "$srcdir/$pkgbase-$pkgver/bindings/python"
     python setup.py build
 
-    cd "$srcdir/$pkgbase-$pkgver/bindings/python2"
-    python2 setup.py build
+    cd "$srcdir/$pkgbase-$pkgver/bindings/python-cffi"
+    python setup.py build
 }
 
 package_notmuch-runtime(){
@@ -58,7 +53,9 @@
 
 package_notmuch-vim(){
     pkgdesc="Vim plugins for notmuch"
-    depends=('notmuch-runtime')
+    depends=('notmuch-runtime' 'ruby')
+    optdepends=('ruby-mail: for sending mail'
+                'elinks: for previewing html mail')
 
     make -C "$srcdir/$pkgbase-$pkgver/vim" DESTDIR="$pkgdir" prefix="/usr/share/vim/vimfiles" install
 }
@@ -69,7 +66,7 @@
     depends=('notmuch-runtime')
     optdepends=('emacs: for using the emacs interface'
                 'vim: for using the vim interface'
-                'python2: for using the python2 bindings'
+                'python-cffi: for using the python-cffi bindings'
                 'ruby: for using the ruby bindings'
                 'gnupg: for email encryption')
     install=notmuch.install
@@ -88,8 +85,8 @@
     cd "$srcdir/$pkgbase-$pkgver/bindings/python"
     python setup.py install --root="$pkgdir" --optimize=1
 
-    cd "$srcdir/$pkgbase-$pkgver/bindings/python2"
-    python2 setup.py install --root="$pkgdir" --optimize=1
+    cd "$srcdir/$pkgbase-$pkgver/bindings/python-cffi"
+    python setup.py install --root="$pkgdir" --optimize=1
 
     # Remove mimeinfo.cache (fixes FS#53629).
     rm "$pkgdir/usr/share/applications/mimeinfo.cache"
@@ -102,5 +99,6 @@
     cd "$srcdir/$pkgbase-$pkgver"
 
     install -Dm755 "contrib/$pkgname/$pkgname" "$pkgdir/usr/bin/$pkgname"
+    install -Dm644 "contrib/$pkgname/${pkgname}.rc" "${pkgdir}/etc/Muttrc.d/${pkgname}.rc"
     install -Dm644 "contrib/$pkgname/${pkgname}.1" "${pkgdir}/usr/share/man/man1/${pkgname}.1"
 }