Verbump, and brought mostly in line with official package.

Note that the slang package doesn't list its .so files in provides,
so the dependency needs to stay on the package itself.

2 files changed, 65 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0d8b81104712..3f3ea5e4944a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,28 +1,46 @@
 pkgbase = mutt-slang
 	pkgdesc = Small but very powerful text-based mail client - slang version
-	pkgver = 1.14.6
+	pkgver = 1.14.7
 	pkgrel = 1
 	url = http://www.mutt.org/
 	arch = x86_64
 	license = GPL
-	depends = gpgme
-	depends = slang
+	makedepends = gpgme
+	makedepends = libidn2
+	depends = gdbm
+	depends = glibc
+	depends = libgpg-error
 	depends = openssl
 	depends = libsasl
-	depends = gdbm
-	depends = libidn2
 	depends = mime-types
 	depends = krb5
+	depends = slang
+	depends = sqlite
+	depends = zlib
 	optdepends = perl: for smime_keys
 	optdepends = smtp-forwarder: to send mail
 	provides = mutt
 	conflicts = mutt
 	backup = etc/Muttrc
-	source = https://bitbucket.org/mutt/mutt/downloads/mutt-1.14.6.tar.gz
-	source = https://bitbucket.org/mutt/mutt/downloads/mutt-1.14.6.tar.gz.asc
+	source = https://bitbucket.org/mutt/mutt/downloads/mutt-1.14.7.tar.gz
+	source = https://bitbucket.org/mutt/mutt/downloads/mutt-1.14.7.tar.gz.asc
 	validpgpkeys = 8975A9B33AA37910385C5308ADEF768480316BDA
-	sha256sums = 47972a0152b81b9f67ff322a0a6682b914c15545bfdeac6bcc2f2c0bf9361844
-	sha256sums = SKIP
+	sha512sums = dc9739b5f0a99ca70fcbd495c71fbead23e3481f9c9e426feb827997c9c42e5f28355084f54788820c96a079dedb649fcc20e69436fb3c4df7e46f372b533e7c
+	sha512sums = SKIP
+	b2sums = f729412d3da97fe9bd76733705317660edfa3858a9eb1012179fb289b03da58d79b6e261dbdc4ab8b001e89ca455e9972bab8f270bac28e887afc7e0bd9fc8c1
+	b2sums = SKIP
 
 pkgname = mutt-slang
+	depends = gdbm
+	depends = glibc
+	depends = libgpg-error
+	depends = openssl
+	depends = libsasl
+	depends = mime-types
+	depends = krb5
+	depends = slang
+	depends = sqlite
+	depends = zlib
+	depends = libgpgme.so
+	depends = libidn2.so
 
diff --git a/PKGBUILD b/PKGBUILD
index e4b68325d462..3b2573bfb30d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,50 +7,59 @@
 
 _pkgbase=mutt
 pkgname=${_pkgbase}-slang
-pkgver=1.14.6
+pkgver=1.14.7
 pkgrel=1
 pkgdesc='Small but very powerful text-based mail client - slang version'
 url='http://www.mutt.org/'
 provides=('mutt')
 conflicts=('mutt')
 license=('GPL')
-backup=('etc/Muttrc')
 arch=('x86_64')
+depends=('gdbm' 'glibc' 'libgpg-error' 'openssl' 'libsasl' 'mime-types' 'krb5' 'slang'
+'sqlite' 'zlib')
+makedepends=('gpgme' 'libidn2')
 optdepends=('perl: for smime_keys'
             'smtp-forwarder: to send mail')
-depends=('gpgme' 'slang' 'openssl' 'libsasl' 'gdbm' 'libidn2' 'mime-types' 'krb5')
-validpgpkeys=('8975A9B33AA37910385C5308ADEF768480316BDA')
+backup=('etc/Muttrc')
 source=("https://bitbucket.org/mutt/mutt/downloads/${_pkgbase}-${pkgver}.tar.gz"{,.asc})
-sha256sums=('47972a0152b81b9f67ff322a0a6682b914c15545bfdeac6bcc2f2c0bf9361844'
+sha512sums=('dc9739b5f0a99ca70fcbd495c71fbead23e3481f9c9e426feb827997c9c42e5f28355084f54788820c96a079dedb649fcc20e69436fb3c4df7e46f372b533e7c'
             'SKIP')
+b2sums=('f729412d3da97fe9bd76733705317660edfa3858a9eb1012179fb289b03da58d79b6e261dbdc4ab8b001e89ca455e9972bab8f270bac28e887afc7e0bd9fc8c1'
+        'SKIP')
+validpgpkeys=('8975A9B33AA37910385C5308ADEF768480316BDA') # Kevin J. McCarthy <kevin@8t8.us>
 
-build() {
-	cd "${srcdir}/${_pkgbase}-${pkgver}"
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--enable-debug \
-		--enable-gpgme \
-		--enable-pop \
-		--enable-imap \
-		--enable-smtp \
-		--enable-hcache \
-		--enable-sidebar \
-		--enable-autocrypt \
-		--with-slang=/usr \
-		--with-gss=/usr \
-		--with-ssl=/usr \
-		--with-sqlite3 \
-		--with-sasl \
-		--with-idn2 \
+prepare() {
+  cd "${srcdir}/${_pkgbase}-${pkgver}"
+  autoreconf -vfi
+}
 
-	make
+build() {
+  cd "${srcdir}/${_pkgbase}-${pkgver}"
+  ./configure --prefix=/usr \
+              --sysconfdir=/etc \
+              --enable-debug \
+              --enable-gpgme \
+              --enable-pop \
+              --enable-imap \
+              --enable-smtp \
+              --enable-hcache \
+              --enable-sidebar \
+              --enable-autocrypt \
+              --with-slang=/usr \
+              --with-gss=/usr \
+              --with-ssl=/usr \
+              --with-sqlite3 \
+              --with-sasl \
+              --with-idn2
+  make
 }
 
 package() {
-	cd "${srcdir}/${_pkgbase}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
+  depends+=('libgpgme.so' 'libidn2.so')
+  cd "${srcdir}/${_pkgbase}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 
-	rm "${pkgdir}"/etc/mime.types{,.dist}
-	install -Dm644 contrib/gpg.rc "${pkgdir}"/etc/Muttrc.gpg.dist
+  # /etc/mime.types is provided by mailcap
+  rm "${pkgdir}"/etc/mime.types{,.dist}
+  install -Dm644 contrib/gpg.rc "${pkgdir}"/etc/Muttrc.gpg.dist
 }