gentoo resync : 15.01.2020

6 files changed, 112 insertions, 10 deletions

diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index 4bdd7414b6de..0f162eb64466 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -2,7 +2,9 @@ AUX 70mu-gentoo.el 76 BLAKE2B 478ebba49409f7b1fd601e4c6019cb9da7cc8c6f9b4f731815
 DIST mu-0.9.18.tar.gz 2250319 BLAKE2B 7eb83a797eccff706ac6b264a7d56feae80e40f370e190e0a94f2524dd73a8bfdb35599909f90d0a2b87fc513bbcf2b00fa307a3e4d0b6718ebdc7f7fcdc6df0 SHA512 47104d18547de0871782abc4e1c6dbf1f9b2489410e5716043861bf8d973d33d2138de7d7ac568b300ca86ae9f1a0fda0fa9555ad9a5938771336ef958183546
 DIST mu-1.0.tar.gz 2273670 BLAKE2B a771b00159142fa4a671d07cf9de6f0f941c432ddee31f19606c260ba3dfef857a36a333f5ede4ca30be88d7b7eae28e996e15a8deebd96971b341f0f72bfbbb SHA512 49b0b86f22e9a6ace1fc3fd6e7a8a523aa9edf092b953d59f59a1ef7311c8c546a261a1a186e3285cea788be20c816c70ac08d1514f700ff97258a2012ad394d
 DIST mu-1.3.5.tar.gz 2305222 BLAKE2B ff6025cf053d7c2880855ec32953a2881ce8bc7d468082f13e45e7684dd41bd7906cbc9a619fd27bd4860bb953e4a547c3d22ea9a7fb4c645825c755ee33b5f9 SHA512 5d7eccec296affbe6e2e31d2204672f8ecac43f1a0c93673f983378fcf7ad8a050662097ec58603251eed31b499054d6c453a2a4e2c70dfdd896c430559b95c0
-EBUILD mu-0.9.18-r2.ebuild 1967 BLAKE2B 2fc80cbf26459398f0f12824cb310eafe4b0af676dfaf1d680bbff480ff7bcbd363ef6db1b022d87b6fa6333be33c47e47baa2a04db9d00653062724075243d2 SHA512 d2d2aaf0e23a3edb2871353eea2beee972aad3a06d1ad30dedb94d0c283850a2ebbf537dd3245e447968ee202105fa0ff1f8b965964765d3e0312cf9f7f1a824
-EBUILD mu-1.0.ebuild 1970 BLAKE2B 1f0d0ec3b5cc6c79a0a83c4c5d0488e81e92304e15134dd4902aa78f63ca77a120a7d10930261eb061f425bdff3d985d0d9fee63f7952abf10a65768fbdbb39c SHA512 1c9522b996bc308452352ecd6343280e95ddc3ce2684918c18f032537d92f1327f9a1271a1abc30ace3469985c628c0eb1c567e61fd634d87e30fb3f0c1f36a8
-EBUILD mu-1.3.5.ebuild 2099 BLAKE2B 863cb8a39459777dbae5fd4601fbb88a51d1fa3bdd97f76699f798484a715677e8b8c6fbae080ae2265ca078e13d9267c023bf06073053377ed25cd941441385 SHA512 f120292c849d27aa15a67fa84fc7f485b076d86565be96f42295115cb04daa55fb69d7b71be50b81aaa7de038fad5020c3c404dea64f8a200f1cd2715ad3c31d
-MISC metadata.xml 823 BLAKE2B de3b4bd9c6633407c16cf0cc5704a3d7fa6a67886139adaa7b23e1b1eea82e3ba19bcc53beaebdacc8d7a2da71539c216f7c62210d698b10ffe33215783e23ee SHA512 bd2265c198b8342c47c5cc428811993f8187b8dee981df72531097b9d8f2c01e21bc2ec39ab1a1f291e189ef2bdb788153f0bfe5f2479e6faa1cb9e6ce0079ae
+DIST mu-1.3.6.tar.gz 2305653 BLAKE2B b9a556c1b374e0b72b6b0c40beba581dc3fe0e0a654a881db3a47582481ef00831e18bcd771e24b231ef843e97f14f7401ad8d041c077617b865f1fa971d1a0f SHA512 c889dc3fc1b7f1333f2adc3891f23ea8977c77ac6af532fec37c6570b4fbb2ce8dda0776568d61dedfa34f0519bb5bba89b90002503c3191a0d633ecfb9d5c87
+EBUILD mu-0.9.18-r2.ebuild 1972 BLAKE2B 9a067e58cefb3ee4fdfe352c4100d455312eaf33ab3792d402f2730978c13cd1b41ddd38b459d6792a35cb629a966b7f8144bf802e7a410c095729b7290a1a4b SHA512 8c72f67087d93a57d193632f23d741ef540218c3a53d9bd28f08f385e387a4aef2695a8a045b3287fe4c131aced8c5d8289086ea48ab4b2a4ea9452b39d6d401
+EBUILD mu-1.0.ebuild 1975 BLAKE2B c8334faad346b75d5ade8eb9e346a8c79f2f5b854955fcb2cd5cbc3c9bbd441a08fb5f252273edcd6039ca481044615e3fbb06001fe482d2584f2347cfbfdfab SHA512 f8083db03299d2bacb27555ed727353fc22c2555d3c9ce5d3cf6d827a233a31d1b318678681e42b60785e5492953c1728012291f513771266085bc258edec96f
+EBUILD mu-1.3.5.ebuild 2105 BLAKE2B b60ee9cb2abfc3059b16f4d6a94ac484d4fb5124e06a087a05b075fcdfd51810c64d7db5b433282a62917fc295afbf480148f64d7e806ca084a1e39bd11ec2a2 SHA512 e5e66dc9a5287bb0e9d08c4da1caba35f63a6d24dfa2db293f6d8c46cdbf22029276a760668522e22dfd9935d749b224dfa5ac6b3da0ffd207a1cda33f10b5e6
+EBUILD mu-1.3.6.ebuild 2174 BLAKE2B 7a7020d48c3be27faafdbc549d4c3fe3b5df879e5050adaf0264eded537ca165398722f02806c50c466648ae360f2da50ae9f6aa5d2d0606ab774ad000c4638e SHA512 9cf350fe05f43655cca58bd13e3b909d1d094e261db11cda8cf929a4a886308aa3165fed1344fe4f4196fa5e19281e5ef4898f351668b47a9ac820e8f5f83d23
+MISC metadata.xml 895 BLAKE2B 2a8d3f5aa6673c03df5bcf495aded3bb07316b4833ed84ec3e2d7030f5cbab8333865da6a4bd67bc8ee69e39bc6540d4a77bd7ddf3b1b9fdd7b5a6dfb7278fe6 SHA512 e5e1e9f3084189fbdbc8fb55127b8b3eec4acd7685b0d4c9ab564644f21fcc53520b89f7ced7bb3972c13d577a030175a9665d30ba513112125409082a7ad7c0
diff --git a/net-mail/mu/metadata.xml b/net-mail/mu/metadata.xml
index 52409e491151..9d458cfbe1a6 100644
--- a/net-mail/mu/metadata.xml
+++ b/net-mail/mu/metadata.xml
@@ -14,7 +14,8 @@
 		are looking for, assuming that you store your e-mails in Maildirs.  It also includes an emacs based mail client mu4e.
 	</longdescription>
 	<use>
-		<flag name="emacs">Install the mu4e mail client.</flag>
+		<flag name="emacs">Install the mu4e mail client</flag>
+		<flag name="mug">Install the mug toy client, not for normal use</flag>
 	</use>
 	<upstream>
 		<remote-id type="google-code">mu0</remote-id>
diff --git a/net-mail/mu/mu-0.9.18-r2.ebuild b/net-mail/mu/mu-0.9.18-r2.ebuild
index 17815abc9802..1384e4bd776e 100644
--- a/net-mail/mu/mu-0.9.18-r2.ebuild
+++ b/net-mail/mu/mu-0.9.18-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ DEPEND="
 	dev-libs/gmime:2.6
 	dev-libs/xapian
 	dev-libs/glib:2
-	emacs? ( >=virtual/emacs-23 )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	!net-mail/mailutils"
 RDEPEND="${DEPEND}"
 
diff --git a/net-mail/mu/mu-1.0.ebuild b/net-mail/mu/mu-1.0.ebuild
index 2ffb7d2dbe8c..67c1fb0dd25e 100644
--- a/net-mail/mu/mu-1.0.ebuild
+++ b/net-mail/mu/mu-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ DEPEND="
 	dev-libs/gmime:2.6
 	dev-libs/xapian
 	dev-libs/glib:2
-	emacs? ( >=virtual/emacs-23 )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	!net-mail/mailutils"
 RDEPEND="${DEPEND}"
 
diff --git a/net-mail/mu/mu-1.3.5.ebuild b/net-mail/mu/mu-1.3.5.ebuild
index 96b9d5115927..3e40b2e3d546 100644
--- a/net-mail/mu/mu-1.3.5.ebuild
+++ b/net-mail/mu/mu-1.3.5.ebuild
@@ -20,7 +20,7 @@ DEPEND="
 	dev-libs/gmime:3.0
 	>=dev-libs/xapian-1.4
 	dev-libs/glib:2
-	emacs? ( >=virtual/emacs-24.4 )
+	emacs? ( >=app-editors/emacs-24.4:* )
 	guile? ( >=dev-scheme/guile-2.0 )
 	!net-mail/mailutils"
 RDEPEND="${DEPEND}"
diff --git a/net-mail/mu/mu-1.3.6.ebuild b/net-mail/mu/mu-1.3.6.ebuild
new file mode 100644
index 000000000000..c75bf292245b
--- /dev/null
+++ b/net-mail/mu/mu-1.3.6.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools elisp-common
+
+DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
+HOMEPAGE="http://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu"
+SRC_URI="https://github.com/djcb/mu/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="emacs guile mug"
+
+DEPEND="
+	dev-libs/glib:2
+	dev-libs/gmime:3.0
+	>=dev-libs/xapian-1.4
+	emacs? ( >=app-editors/emacs-24.4:* )
+	guile? ( >=dev-scheme/guile-2.0 )
+	mug? (
+		net-libs/webkit-gtk:4
+		x11-libs/gtk+:3
+	)"
+# net-mail/mailutils also installes /usr/bin/mu.  Block it until somebody
+# really wants both installed at the same time.
+RDEPEND="
+	${DEPEND}
+	!net-mail/mailutils"
+BDEPEND="virtual/pkgconfig"
+
+SITEFILE="70mu-gentoo.el"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable emacs mu4e)
+		$(use_enable mug gtk)
+		$(use_enable mug webkit)
+		$(use_enable guile)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	dobin mu/mu
+	dodoc AUTHORS HACKING NEWS NEWS.org TODO README README.org ChangeLog
+	if use emacs; then
+		elisp-install ${PN} mu4e/*.el mu4e/*.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+		doinfo mu4e/mu4e.info
+	fi
+
+	doman man/mu-add.1 man/mu-bookmarks.5 man/mu-cfind.1 man/mu-easy.1 \
+		man/mu-extract.1 man/mu-find.1 man/mu-help.1 man/mu-index.1 \
+		man/mu-mkdir.1 man/mu-query.7 man/mu-remove.1 \
+		man/mu-script.1 man/mu-server.1 man/mu-verify.1 \
+		man/mu-view.1 man/mu.1
+
+	if use guile; then
+		  doinfo guile/mu-guile.info
+	fi
+
+	if use mug; then
+		  dobin toys/mug/mug
+	fi
+}
+
+src_test() {
+	emake check
+}
+
+pkg_preinst() {
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		elog "After upgrading from an old major version, you should"
+		elog "rebuild your mail index."
+	fi
+}
+
+pkg_postinst() {
+	if use emacs; then
+		einfo "To use mu4e you need to configure it in your .emacs file"
+		einfo "See the manual for more information:"
+		einfo "http://www.djcbsoftware.nl/code/mu/mu4e/"
+	fi
+
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}