gentoo resync : 16.09.2020

3 files changed, 10 insertions, 107 deletions

diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index e87bbed84912..26bd3aadc24e 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -1,10 +1,8 @@
 AUX 70mu-gentoo-autoload.el 68 BLAKE2B 518f6544d9b36a845e58fca8c4c9dc02c6855f48576508d47718afb1b08b4f83ce87f257e68756690f4ac70ed9770b7064f2613dc3c4077bbcf9b826512644d0 SHA512 ae50746ba93e3ac81a11d3c8746b72182fcdadc3e29966d65233debd8e6b8aa56f76f5e6a70fc68f7761e4dd55045d2b32e3765cedcced4813de3682187beeea
-DIST mu-1.4.1.tar.gz 2311134 BLAKE2B 4d44032874217167d46a68b1c837fb443dc860f1eb1f698c08d3731c131e196483028b0eee8bec13bbec71eeab6df1146013beb00b31824630154e14af914c09 SHA512 9a6d20a814f0cdf7c0a04e0e4a22210a12d539d9be713be8f689f2ed3ba39eaf9da7d1969a10f47af1a201cc23e91696e379cfcbd5d6586aea5e83997ba3e043
 DIST mu-1.4.10.tar.gz 2309459 BLAKE2B 38aa09e1efd788f1ed0d490dfba04bf4f3fccf1eb40d22d2d205934ab6d71ec8739d1baa019ba4c9a0593a0d9487533a46048f71be042178bd33bde6130cbb80 SHA512 59c06e1a0bc893c7dcf5e758dad15be80667be8bb914e97f16158709ebfd50ca29b3a27934bc2df29cc378ce17a3778c5c44738703aa77f5bde21050abb6eb0c
 DIST mu-1.4.12.tar.gz 2309385 BLAKE2B 4f1b7c520a38e5f17471c2a9dc814decc019a4afce89d642ecbaee988752bc20a7f525809a6d911cbc46dadbbeb5db126f7d01465e3dc18ffb099ad1159d3839 SHA512 7e376a58fed80ed1110ad342e3578a427779d4fd715990ce5b87d50b6c2488774b47f9b151dca80bb8723eee8db99699f97df975d199dae0d75576f5c2ebc35a
-DIST mu-1.4.4.tar.gz 2311600 BLAKE2B 1953dc9e63fe013af2821a58fde0222d3d7b61266807bb95345aff7c6e3f988fa6589bcca79612bd64296f50e2b4feda62cc3f4aa4d731f3f4cebe4e3a21cceb SHA512 db317706956304df9e0c6d53ce9b2bf444f5fc66903deb8ac13c8d771ada016d009e3b10d8bf76cfeda1d712fa3e23bed70362334231cccfc072bc181c6660e5
-EBUILD mu-1.4.1.ebuild 1784 BLAKE2B 27466207a50c1f175b56d6ff17f775fa644b884074d9914e32ae81c7f1887a1e140225a5f2d8875dc5cd18db7563ce58577082d00ad039c54d25207e76499e17 SHA512 e1aad3af510eb9be475b0e983048d63fd0ad007cfe178265daada05be7bd32edc70c9be8a4b097a5a26bf5a2ad0c970565cd33350cd77534ba4320750cfa8018
+DIST mu-1.4.13.tar.gz 2309545 BLAKE2B 9a83e86ab73e325617694f01877a11a93a5bd701cedc776640563f0a5e61946064e201d3f5da2110e1f9583dde9a73e401dd2f018161380435f48f132b2df103 SHA512 0f8e7f75332257e8cfdecf2c27bc23c83420387e40ecf92089232af6c545700a6c4925665b39fc236cacf8b26fa4b81df71775cdbe04c340fe3455c54c0d1bbc
 EBUILD mu-1.4.10.ebuild 1784 BLAKE2B 27466207a50c1f175b56d6ff17f775fa644b884074d9914e32ae81c7f1887a1e140225a5f2d8875dc5cd18db7563ce58577082d00ad039c54d25207e76499e17 SHA512 e1aad3af510eb9be475b0e983048d63fd0ad007cfe178265daada05be7bd32edc70c9be8a4b097a5a26bf5a2ad0c970565cd33350cd77534ba4320750cfa8018
 EBUILD mu-1.4.12.ebuild 1786 BLAKE2B 36766ba266400ab63b36a986f121de47802f9fb46f7fafaab41af1b40ae2cb2c0bfb34edb3cb0f75bbe1926dbdb4f0309afd64c92cb18553711c35b44b96d8aa SHA512 9e89d8989a8c90d2ab14ad99ece718fa78118cbf53563f580be9b67b50700400fb2c96b0e1995390446c5a1f62af28ad926c716a80f5beaf380311c91b123453
-EBUILD mu-1.4.4.ebuild 1786 BLAKE2B 36766ba266400ab63b36a986f121de47802f9fb46f7fafaab41af1b40ae2cb2c0bfb34edb3cb0f75bbe1926dbdb4f0309afd64c92cb18553711c35b44b96d8aa SHA512 9e89d8989a8c90d2ab14ad99ece718fa78118cbf53563f580be9b67b50700400fb2c96b0e1995390446c5a1f62af28ad926c716a80f5beaf380311c91b123453
+EBUILD mu-1.4.13.ebuild 1753 BLAKE2B f50edadcca0becdf808e69c218253b636139d0cbbaf6de7fe685660abf24284ac5980b7ecbb3447ce953ab0f68fad2777cfbe04d55c6dbfddd509e215d3eddaf SHA512 a9b216c20bf568653376b2d0cd73d3c67f8eef59c196e884b3e5b1a4cfeb2a28edcb46259bb8ba802862f59ec1b3997d1fcd5382cfe747fbb067a050280195e2
 MISC metadata.xml 895 BLAKE2B 2a8d3f5aa6673c03df5bcf495aded3bb07316b4833ed84ec3e2d7030f5cbab8333865da6a4bd67bc8ee69e39bc6540d4a77bd7ddf3b1b9fdd7b5a6dfb7278fe6 SHA512 e5e1e9f3084189fbdbc8fb55127b8b3eec4acd7685b0d4c9ab564644f21fcc53520b89f7ced7bb3972c13d577a030175a9665d30ba513112125409082a7ad7c0
diff --git a/net-mail/mu/mu-1.4.1.ebuild b/net-mail/mu/mu-1.4.1.ebuild
deleted file mode 100644
index fe038e53b674..000000000000
--- a/net-mail/mu/mu-1.4.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# 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="https://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.2 )
-	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 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-*.*
-
-	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 "https://www.djcbsoftware.nl/code/mu/mu4e/"
-	fi
-
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/net-mail/mu/mu-1.4.4.ebuild b/net-mail/mu/mu-1.4.13.ebuild
index 99919703af77..0dfc0d7be4e0 100644
--- a/net-mail/mu/mu-1.4.4.ebuild
+++ b/net-mail/mu/mu-1.4.13.ebuild
@@ -15,14 +15,14 @@ KEYWORDS="~amd64 ~x86"
 IUSE="emacs guile mug"
 
 DEPEND="
-	dev-libs/glib:2
-	dev-libs/gmime:3.0
-	>=dev-libs/xapian-1.4
+	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.2 )
+	guile? ( >=dev-scheme/guile-2.2:* )
 	mug? (
-		net-libs/webkit-gtk:4
-		x11-libs/gtk+:3
+		net-libs/webkit-gtk:4=
+		x11-libs/gtk+:3=
 	)"
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
@@ -65,10 +65,6 @@ src_install() {
 	fi
 }
 
-src_test() {
-	emake check
-}
-
 pkg_preinst() {
 	if [[ -n ${REPLACING_VERSIONS} ]]; then
 		elog "After upgrading from an old major version, you should"
@@ -81,9 +77,9 @@ pkg_postinst() {
 		einfo "To use mu4e you need to configure it in your .emacs file"
 		einfo "See the manual for more information:"
 		einfo "https://www.djcbsoftware.nl/code/mu/mu4e/"
-	fi
 
-	use emacs && elisp-site-regen
+		elisp-site-regen
+	fi
 }
 
 pkg_postrm() {