From 8a69242da042bff03cae48d7e28ca4f00d08c7aa Mon Sep 17 00:00:00 2001
From: Benjamin Slade <slade@jnanam.net>
Date: Sat, 7 Aug 2021 10:17:38 -0600
Subject: [PATCH] combine mu and mu4e packages and update to 1.6.3

- combine mu and mu4e packages under (more discoverable) name "mu4e"
- add option for optional guile components
- update to 1.6.3
---
 srcpkgs/mu/template   | 36 ------------------------------------
 srcpkgs/mu4e          |  1 -
 srcpkgs/mu4e/template | 26 ++++++++++++++++++++++++++
 3 files changed, 26 insertions(+), 37 deletions(-)
 delete mode 100644 srcpkgs/mu/template
 delete mode 120000 srcpkgs/mu4e
 create mode 100644 srcpkgs/mu4e/template

diff --git a/srcpkgs/mu/template b/srcpkgs/mu/template
deleted file mode 100644
index 36d67ef65cba..000000000000
--- a/srcpkgs/mu/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'mu'
-pkgname=mu
-version=1.6.1
-revision=1
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config texinfo glib-devel"
-makedepends="xapian-core-devel gmime3-devel libuuid-devel"
-short_desc="Emacs-based tool for dealing with e-mail stored in the Maildir-format"
-maintainer="Benjamin Slade <slade@lambda-y.net>"
-license="GPL-3.0-or-later"
-homepage="https://www.djcbsoftware.nl/code/mu/"
-distfiles="https://github.com/djcb/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=1c9ca62c50f1f087c15aa94c6c02d206a7f297b7903dfdf67e1ced4460d7c784
-
-if [ ! "$CROSS_BUILD" ]; then
-	hostmakedepends+=" emacs"
-else
-	configure_args+=" --disable-mu4e"
-fi
-
-pre_configure() {
-	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
-	autoreconf -fi
-}
-
-if [ ! "$CROSS_BUILD" ]; then
-	mu4e_package() {
-		short_desc+=" - Emacs frontend"
-		depends="${sourcepkg}-${version}_${revision} emacs"
-		pkg_install() {
-			vmove usr/share/emacs
-			vmove usr/share/info
-			vmove usr/share/doc/mu/mu4e*
-		}
-	}
-fi
diff --git a/srcpkgs/mu4e b/srcpkgs/mu4e
deleted file mode 120000
index 4f9d522cd3ad..000000000000
--- a/srcpkgs/mu4e
+++ /dev/null
@@ -1 +0,0 @@
-mu
\ No newline at end of file
diff --git a/srcpkgs/mu4e/template b/srcpkgs/mu4e/template
new file mode 100644
index 000000000000..52f79963d9c5
--- /dev/null
+++ b/srcpkgs/mu4e/template
@@ -0,0 +1,26 @@
+# Template file for 'mu4e'
+pkgname=mu4e
+version=1.6.3
+revision=1
+wrksrc="mu-${version}"
+build_style=gnu-configure
+configure_args="--enable-mu4e $(vopt_if guile --enable-guile)"
+hostmakedepends="automake emacs libtool pkg-config texinfo glib-devel"
+makedepends="xapian-core-devel gmime3-devel libuuid-devel $(vopt_if guile guile)"
+short_desc="Emacs email client using the mu Maildir search engine"
+maintainer="Benjamin Slade <slade@lambda-y.net>"
+license="GPL-3.0-or-later"
+homepage="https://www.djcbsoftware.nl/code/mu/"
+distfiles="https://github.com/djcb/mu/releases/download/${version}/mu-${version}.tar.xz"
+checksum=fe286eebc2d9a2060a67c365aed7dd7a6de1fe104f89da36976d8737200754b6
+
+pre_configure() {
+	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
+	autoreconf -fi
+}
+
+pkg_install() {
+	vmove usr/share/emacs
+	vmove usr/share/info
+	vmove usr/share/doc/mu/mu4e*
+}