gentoo (leap year) resync : 29.02.2020

7 files changed, 116 insertions, 32 deletions

diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index bfc7d379dd4f..49553e8acff4 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -1,10 +1,12 @@
+AUX 70mu-gentoo-autoload.el 68 BLAKE2B 518f6544d9b36a845e58fca8c4c9dc02c6855f48576508d47718afb1b08b4f83ce87f257e68756690f4ac70ed9770b7064f2613dc3c4077bbcf9b826512644d0 SHA512 ae50746ba93e3ac81a11d3c8746b72182fcdadc3e29966d65233debd8e6b8aa56f76f5e6a70fc68f7761e4dd55045d2b32e3765cedcced4813de3682187beeea
 AUX 70mu-gentoo.el 76 BLAKE2B 478ebba49409f7b1fd601e4c6019cb9da7cc8c6f9b4f7318155225fa84ebd82cb73ba79637c0aa2dda9d9779e525b0577bc940a0d613a3fa64031e35f3178a46 SHA512 61cc2bf611a0d1f2aa53b4624c52e1aa9672a81b4b8d7386aad1bf70b0b0db6ee19e011acc5a1a28b220d99eb3683140a2ff02dc3e01ea68f512ee05ec7bc23e
 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
 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 2172 BLAKE2B 01583bc9ea1ec928a34082416b5e5d93bd30a80e9201e23c4ae776c39b76b499e4b36aacf1045585efc477675d7df223910853cf63ae84535450eb9a44a868be SHA512 0bcde3e77f99f7a28da6df51a4ea496212a574a05dc68eeef3503d2a88015741a4224bc55f4cdbe189f0f3ab786a6f7f860f7864232e85ebc69339f40b5bc4d3
+EBUILD mu-0.9.18-r3.ebuild 1773 BLAKE2B c11a826bcf373fa116b225a9e84505b56129e8e3ac1b12dfb8946eef21ac062a854be111f871e7a835959cfdcc7b766950fb41ce49986ba12f850f3185805453 SHA512 cef4a8ccf07a5cd1181b5ffde3e8ed7d38d37a35af49fc3b38ccacaa7df901983f2b108ba1e72789232321f723cb9d14d450b5efbba52f2a37a3f84bf9d0d358
+EBUILD mu-1.0-r1.ebuild 1776 BLAKE2B 48bdc1543bf0cca1d64e7d63e2e51d5d1b0ac87d5560314bf1548edee12b49c7d073ccf2fc813d0eefd351dd242577b291c18938c84333ba1e90f0925338de8d SHA512 1838adf12f3944ca1402106e210d1459bc19eee5fc28428a9b903e700705842bf084d00f55235ab65d6d7b952822e80df9e151264ab25419f57361fe1117fd48
+EBUILD mu-1.3.5-r1.ebuild 1960 BLAKE2B 721f6f318267d356e987f504f21ced0c96a819e70ad4abcd4b7875f06fe551895592ae403d29600089f0fa58689c5325e564508d8e357c2443b88bc44296006e SHA512 2a0c244fc44c7cc72a9713562c5ff282ca04c5791df5c4a96b5ef587b9f73968698d5ce1574bd68a8f3bbbfb8a711fb21a2b78d5579fe59f144db078a32e774f
+EBUILD mu-1.3.6-r1.ebuild 2027 BLAKE2B 6d1f1ee8e1ec3fb72eee193fe464e641662656ff62f4027be0151f781cc7126c7e49e45dedd5c66d363951a9a51170e886407b5a7b0d42dab28f87ce3baf34d5 SHA512 cd1d7d25e22ae25f2914e255b2a5404ad5bcb4effd53780bf6a774c304938d1b165a0bddc7ca3b03848f31928507bb7a785125c7d0155c76abd08d3ed5d995b7
+EBUILD mu-1.3.6-r2.ebuild 2038 BLAKE2B 2518184e5c7baa06a905db7b843dd5de5dafda4f03bd4b0279a1feb83b8b6f17f7edb04e5e2d49dd8dcf94030191cc2965fa7169e873f6a742d8102b4e30cead SHA512 b2c02b16604bc77a0fdba274b8d66f44f30d3373f6544f8ef43ba3493b42a35ac94f9a999f855df935cbfde38c97930b41146d36af22f290ace5cde2499fd515
 MISC metadata.xml 895 BLAKE2B 2a8d3f5aa6673c03df5bcf495aded3bb07316b4833ed84ec3e2d7030f5cbab8333865da6a4bd67bc8ee69e39bc6540d4a77bd7ddf3b1b9fdd7b5a6dfb7278fe6 SHA512 e5e1e9f3084189fbdbc8fb55127b8b3eec4acd7685b0d4c9ab564644f21fcc53520b89f7ced7bb3972c13d577a030175a9665d30ba513112125409082a7ad7c0
diff --git a/net-mail/mu/files/70mu-gentoo-autoload.el b/net-mail/mu/files/70mu-gentoo-autoload.el
new file mode 100644
index 000000000000..d868bf30334c
--- /dev/null
+++ b/net-mail/mu/files/70mu-gentoo-autoload.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'mu4e "mu4e" nil t)
diff --git a/net-mail/mu/mu-0.9.18-r2.ebuild b/net-mail/mu/mu-0.9.18-r3.ebuild
index 1384e4bd776e..e8f78f993833 100644
--- a/net-mail/mu/mu-0.9.18-r2.ebuild
+++ b/net-mail/mu/mu-0.9.18-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,14 +14,11 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="emacs"
 
-# net-mail/mailutils also installes /usr/bin/mu.  Block it until somebody
-# really wants both installed at the same time.
 DEPEND="
 	dev-libs/gmime:2.6
 	dev-libs/xapian
 	dev-libs/glib:2
-	emacs? ( >=app-editors/emacs-23.1:* )
-	!net-mail/mailutils"
+	emacs? ( >=app-editors/emacs-23.1:* )"
 RDEPEND="${DEPEND}"
 
 SITEFILE="70mu-gentoo.el"
@@ -33,14 +30,13 @@ src_prepare() {
 
 src_configure() {
 	# Todo: Make a guile USE-flag as soon as >=guile-2 is avaiable
-	# Note: --disable-silent-rules is included in EAPI-5
 	econf --disable-guile \
 		--disable-gtk \
 		--disable-webkit \
 		$(use_enable emacs mu4e)
 }
 
-src_install () {
+src_install() {
 	dobin mu/mu
 	dodoc AUTHORS HACKING NEWS NEWS.org TODO README README.org ChangeLog
 	if use emacs; then
@@ -55,7 +51,7 @@ src_install () {
 		  man/mu-view.1 man/mu.1
 }
 
-src_test () {
+src_test() {
 	# Note: Fails with parallel make
 	emake -j1 check
 }
diff --git a/net-mail/mu/mu-1.0.ebuild b/net-mail/mu/mu-1.0-r1.ebuild
index 67c1fb0dd25e..8a21040cf96c 100644
--- a/net-mail/mu/mu-1.0.ebuild
+++ b/net-mail/mu/mu-1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,14 +14,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="emacs"
 
-# net-mail/mailutils also installes /usr/bin/mu.  Block it until somebody
-# really wants both installed at the same time.
 DEPEND="
 	dev-libs/gmime:2.6
 	dev-libs/xapian
 	dev-libs/glib:2
-	emacs? ( >=app-editors/emacs-23.1:* )
-	!net-mail/mailutils"
+	emacs? ( >=app-editors/emacs-23.1:* )"
 RDEPEND="${DEPEND}"
 
 SITEFILE="70mu-gentoo.el"
@@ -33,14 +30,13 @@ src_prepare() {
 
 src_configure() {
 	# Todo: Make a guile USE-flag as soon as >=guile-2 is avaiable
-	# Note: --disable-silent-rules is included in EAPI-5
 	econf --disable-guile \
 		--disable-gtk \
 		--disable-webkit \
 		$(use_enable emacs mu4e)
 }
 
-src_install () {
+src_install() {
 	dobin mu/mu
 	dodoc AUTHORS HACKING NEWS NEWS.org TODO README README.org ChangeLog
 	if use emacs; then
@@ -55,7 +51,7 @@ src_install () {
 		  man/mu-view.1 man/mu.1
 }
 
-src_test () {
+src_test() {
 	# Note: Fails with parallel make
 	emake -j1 check
 }
diff --git a/net-mail/mu/mu-1.3.5.ebuild b/net-mail/mu/mu-1.3.5-r1.ebuild
index 3e40b2e3d546..41476616e4fa 100644
--- a/net-mail/mu/mu-1.3.5.ebuild
+++ b/net-mail/mu/mu-1.3.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,15 +14,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="emacs guile"
 
-# net-mail/mailutils also installes /usr/bin/mu.  Block it until somebody
-# really wants both installed at the same time.
 DEPEND="
 	dev-libs/gmime:3.0
 	>=dev-libs/xapian-1.4
 	dev-libs/glib:2
 	emacs? ( >=app-editors/emacs-24.4:* )
-	guile? ( >=dev-scheme/guile-2.0 )
-	!net-mail/mailutils"
+	guile? ( >=dev-scheme/guile-2.0 )"
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
@@ -43,7 +40,7 @@ src_configure() {
 		$(use_enable guile)
 }
 
-src_install () {
+src_install() {
 	dobin mu/mu
 	dodoc AUTHORS HACKING NEWS NEWS.org TODO README README.org ChangeLog
 	if use emacs; then
@@ -63,7 +60,7 @@ src_install () {
 	fi
 }
 
-src_test () {
+src_test() {
 	# Note: Fails with parallel make
 	emake -j1 check
 }
diff --git a/net-mail/mu/mu-1.3.6.ebuild b/net-mail/mu/mu-1.3.6-r1.ebuild
index dc9ae87483e0..fdbb2fb3c2bd 100644
--- a/net-mail/mu/mu-1.3.6.ebuild
+++ b/net-mail/mu/mu-1.3.6-r1.ebuild
@@ -24,11 +24,7 @@ DEPEND="
 		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"
+RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 SITEFILE="70mu-gentoo.el"
diff --git a/net-mail/mu/mu-1.3.6-r2.ebuild b/net-mail/mu/mu-1.3.6-r2.ebuild
new file mode 100644
index 000000000000..27f87d5b69a2
--- /dev/null
+++ b/net-mail/mu/mu-1.3.6-r2.ebuild
@@ -0,0 +1,95 @@
+# 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
+	)"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+SITEFILE="70mu-gentoo-autoload.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
+}