gentoo resync : 03.03.2021

4 files changed, 4 insertions, 183 deletions

diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index efe4552a53c0..a7e214c57fd1 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -1,7 +1,6 @@
 AUX comsatd.initd 569 BLAKE2B 1b4ad287b67ef6d95fbc626296e79a857264754159967c54105e9d9f4493e95d3494cfce6082f289358021e02bbaac580a1b4d78ca8b2cc713af57197e532431 SHA512 9c36ddf70bf4f0e3c56f55651a740014078e3a1a79569a62ccd74e1ec7167eac6ecb69d56c15913d815c472fe943d17a1e781a669208d37c97671afea2208f8f
 AUX imap4d.initd 566 BLAKE2B 2d030e47f63b4133eed4b47c9069c54de290f907d9429eb99675380569e1e0efdbb1172664ba1ee0f2924ac7284981fbe350d1543a6d0790722456523d997535 SHA512 51d6cf4285c6823d97e52c7eb408a80aa66376f329685acdc21e096c2099a044b2fd18e7b9e5ed89406a3cd1f16b7aa7b0243f8ea46aa7824da48b566ec00324
 AUX mail 82 BLAKE2B 6d9cc293deff8f99cea0ce8842dd34e658844ca9a1f4e530d3c95f8154ed337ab6ccc2b6263af9cfa8078913a7b70beb5874c999174d5648c1faeace8f68e146 SHA512 80080a3118ed66cfde44ad3663e4b07bcd5fe756b86a213ea4e1ab86e27f8485dcf02af3ee6b7f6f12105a267b9619376668e0cb6e60743ffb7664d2dbea9144
-AUX mailutils-3.10-get_size.patch 989 BLAKE2B b24d0c942d35b943ff211d9b688ee3a4f805e42de63f1d0a9309beec7a0619d2e2d093e5e632bda8268bd34cac460fe9ed38c0e7fe7e827faaba4d6a2099ef80 SHA512 13aea65571a073eb9a556d74ae0384ffd326ca39854b47b04208f2543fc26bf6fcad5ced60b912c2569e23a2d89b8109ddc1182ec95bd40d6ed0cbb5acf677d8
 AUX mailutils-3.5-add-include.patch 275 BLAKE2B 2502fb3226bc63ae98d018392fa1107b4079ea51cd8e57b4e97522d21e696bd6048fad2de885f88644d23f434a6e407f42ba8fcbcfe5b1e65884f37718e34328 SHA512 0972cde536a1a82fe243c9b048fc15f4863586a2344b54c9b4f6f8a5935762c7272c0af2698239af7de9da62b1c2928bc7f621e01f447423fdd8288cedee88b6
 AUX mailutils-3.6-underlinking.patch 368 BLAKE2B d578b46b45bba39fe8b776abfa4394e3adc10c2f811ed4d20fe7a8cf7b2442ebd040dd8a8c5c9023e1f9b635e252cade01ecb08b898bf8e4e2da97e5349497ba SHA512 a958be77edbd01af80f824c70b5f85fde526eadfd58db2476317d44b1d48fb2c2a90c84e49204a84f9efee91c51c33275f6c8254eecd84fa2681c84230b42173
 AUX mailutils-3.8-fix-tests.patch 1254 BLAKE2B 68fc23fc1a6cc98fd5cc6f50afec22373cba028a8b5c81472a843b00d390cb93b7e3194cb8ecd6274552d0610137286bbbac2d33c548b93f2c8c18cc39cf2775 SHA512 2de6971a0811e2501c55a45bf72c80010c81f347178219fa75725cdfc3263f77cc42fd2d8a9209055e889ea8d6eb918a8fc5d86c3fd7f1ac6d5c387bd6f4dbe5
@@ -10,14 +9,12 @@ AUX mailutils-3.9-python-config.patch 905 BLAKE2B c7f5553b89a93d025cca13b4a882d0
 AUX mailutils-3.9-underlinking.patch 404 BLAKE2B d162f818580bcdbba54f0aa56fff49461c8efe1e06e3dee213f9910253e014a8e44a3ae34006c2b8bc56dad687d0522eb86e6bd040c08bc714717c49fe2885ad SHA512 8782f59323ea426ecac65ad5b5e22e37f1150bab8782889b0c16f7d28c10030a78f77210141d1f74edcdaf47db70154616003df4143f664cb01b875e2fee1348
 AUX mailutils.rc 258 BLAKE2B 3dc68190e11c8bf5016b0fe8b22c61f79ba7de96a1f230f7d0743ba23fa903cb9f99fac94a7363c7d80b7bbaf76e2d4de848e7ac726642fb23c56caf43a46568 SHA512 691bcc81fd355d8f2776e72006c149996273579e099f24970ff0c5dd6bdf65cd64e31597f8b3d8e0a900a91c3325b8d2a1a96682a9b3ff53acd41218fe8721fe
 AUX pop3d.initd 563 BLAKE2B fd09d7a7499c888eddfb812644102f979c2423e9b1a9f0077655b6ae4c1eb4214f685ef7843e74a808e52ee988cc3fbefa278754db824256a4972c83fc0ada31 SHA512 7847c29a03f21df82d36c077ccb38329457a332cccdfba24bee3b1c9a8170fc71c07ee674408f069693953dd1bf44b8b8f782dcc35d6b16e62f70b2b32ce018f
-DIST mailutils-3.10.tar.xz 3102328 BLAKE2B 49ea417f71816db2ca1e6a514e5f662d7ef66dc72ae93141ebb8ee006d78ad89587f4b09a96985fdb17335b5f58f8eb654cef23d64fc6d994948786e4a4b1410 SHA512 3a74c9a4bb197feecb2e2c4acfdfac6104c723722b1b2026183bc4cdb6872a45563034f82a56374fd3f51a79999b0f1d47e1169c971d1222fdc1f7b67e66550f
 DIST mailutils-3.11.1.tar.xz 3129416 BLAKE2B f7a13bd1c545b051d213656bea52d9df6409baffe8f1d9755826ef306cc5dc2433b9fd57ea56d5a64d299e8c4babc2dfee8b8f2ee8f1537519c0cb2a568a7717 SHA512 6a1f20d6bf9cda9c90d3bd07a4c23a52d78153a18e89b1cb69682b5efc6c450d7791d430855b47ed97e078e0ec175c4b2732317fd7115767ff01dc808f36145e
-DIST mailutils-3.11.tar.xz 3114388 BLAKE2B 69c648c412db8480366a27bdd654fcbac076e42417519eaaf4a30ea1bf87a8bc58ebbf8dd8499ea5fa81bcdbf844f6066644c8f7b0abf678fadfd8c8e6b3208d SHA512 98584c827780405c701afb1d75aab30a1a63be0456e51ff1ecff0f89422b993cad573d4d8559444de73ace738a7899fd491b6778294ecd0c96b279be833b5438
+DIST mailutils-3.12.tar.xz 3134484 BLAKE2B eac7934e9332482adffa3d4b1574d89a65949644ca8dd14e507e9c5f268d485b97f4d61deadf34b2ddcae1b91deee93372e9ebd53c88a0c0092346a0d83fd67e SHA512 a7d681bc7a763b7f09b704c8a536ea1c2444c52ca736eca321ca72fd32e2e62c0e14687ba79654d9162d45189d0621b1c75c639b81e04a79bbf3b3c09b9cebd2
 DIST mailutils-3.8.tar.xz 2998596 BLAKE2B 4d09c7b5113129b3d2f3b113808d4460d025d4f0eec00dd1209a95f23abe97683b5d50cfe5229f1e5db48ddd6ca66c73fa6b0c1bfe03b324dbf40b6a26ff76f5 SHA512 4d081ae492beb0f9c1945541d63b52f155f11ca172abaedbe465955ac11097037f440e1aaed8d512cd3aab65f7792b755a7e4b9428a90ad7a833de87b1c4f1f9
 DIST mailutils-3.9.tar.xz 3075268 BLAKE2B 43ee5bf297951b3c894b467a46d3983dac3e115c02169da0ee2ccbc23f8b71d7439083093f4b0710f19c78f108df99dee3310f5f6adc5b7c1792a0a7be33aab6 SHA512 1eef9bebeeafbf974e54b87705444ee02b663a86e22442a9ec5db16ade38e6e9a3079ee8a8267393e97d6e9e477917617b2e1d57d3287ab19e4df73b66e5a8d4
-EBUILD mailutils-3.10.ebuild 3642 BLAKE2B ef773a495bf84faa66af2eb9e820e9747a1f07402359f7bd38cfb3f2428c24be9fdae65d3d85cb2bf721003bcbfaa1f4cec0ce82223cc2f0ffbc8c747d224963 SHA512 b9bb5edd87293be017e2f57d9beee45401b3eb87a84c27042264fbe4540aee830271f8b3b6bdb78d19c4a8b4005496e0a7bf212b7686436bd68e2cb13dc3e1db
 EBUILD mailutils-3.11.1.ebuild 3601 BLAKE2B 4a5d51fa321729f32acabe36ffd2f5d8a3350b1d9fd0ea4e3ffc31f60e4c0d8607efec285ff48696bc32bdde7d29547108cf08f140a91d3af6c938afd19579f3 SHA512 d295bfb83b2b77319c24b2f9cae1c7adebe4e8e0bb6d5d1e50a69b5904839d3806122f122132d6c25737334cec11b22397108ac034bdc1e24ac75bdcac84f6c6
-EBUILD mailutils-3.11.ebuild 3601 BLAKE2B 4a5d51fa321729f32acabe36ffd2f5d8a3350b1d9fd0ea4e3ffc31f60e4c0d8607efec285ff48696bc32bdde7d29547108cf08f140a91d3af6c938afd19579f3 SHA512 d295bfb83b2b77319c24b2f9cae1c7adebe4e8e0bb6d5d1e50a69b5904839d3806122f122132d6c25737334cec11b22397108ac034bdc1e24ac75bdcac84f6c6
+EBUILD mailutils-3.12.ebuild 3605 BLAKE2B a9b90fcf7ff96971b9775be2439225f001e10d1f74322ae4770e915dc4e5b5ab3727e7000496c0ee9d9a79de3d82dabf59ed2be58edbdd85ce19960c095fe10e SHA512 27410269e5e447284c641bc7506ee9747af33a4cf052a0aaddade39f96d6a6c492df1ddb500d25a5706d1f6ab8a32a49c7b7c82bd2323756bfdc6618180d153c
 EBUILD mailutils-3.8.ebuild 3713 BLAKE2B 9378f85c9dda9020ff7af2df2b8400d49aa3e5bc24518e12b1f6d67d23b1fd84eee41e6b1d0a69a078dc2da80829ce294f4cbcb9b42e057fed2523e516eee41d SHA512 5897d19e4601b75fc1f995845501278d2daa9f01df5b48089290f632ae26b72079e157bb9234b96a7c3a78231518408f5f39a9d031ea9c297c10873ed6de091d
 EBUILD mailutils-3.9.ebuild 3726 BLAKE2B 3032236b95f375f3e52b6a05d3c931b161d2c893f835b26420b6f0cb98f0b7543945ef40b28d789bdecd9d95dad7b662367d9ea3b36bcd7c2c82c3d3c371caa5 SHA512 75f6db6e2ea5bf22603dff81cd15c763180c2734ffed11c800e92a33f66d98e005a80585de42d91f5415fd8ffee495a8e9dacd9ed90e0dc7291e9309da285ba2
 MISC metadata.xml 602 BLAKE2B e29b6203ef727041c0bb5483d46ddbd256f55f40d26ff94008fc3869dea23036369029a168a5b31fe3da8ee9c529d8c1cd9d0004691670cb9bebe77ef4973270 SHA512 602ef10835b14c359ac19dbce157ef5c073acb52286f7349feb4b8ec3940899ea4dba9d77ad4d4a3d540d86576cfb9f46e502cb9e8aa60cecb4a2f4b0b6358da
diff --git a/net-mail/mailutils/files/mailutils-3.10-get_size.patch b/net-mail/mailutils/files/mailutils-3.10-get_size.patch
deleted file mode 100644
index 3ec15968916b..000000000000
--- a/net-mail/mailutils/files/mailutils-3.10-get_size.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 37713b42a501892469234b90454731d8d8b7a3e6 Mon Sep 17 00:00:00 2001
-From: Sergey Poznyakoff <gray@gnu.org>
-Date: Mon, 17 Aug 2020 20:34:21 +0300
-Subject: Bugfix (complements fd9a86d37b)
-
-* mda/lib/mailquota.c (sql_retrieve_quota): Fix a leftover use of
-get_size.
----
- mda/lib/mailquota.c | 12 +++---------
- 1 file changed, 3 insertions(+), 9 deletions(-)
-
-diff --git a/mda/lib/mailquota.c b/mda/lib/mailquota.c
-index 7b7dd52d9..af719a591 100644
---- a/mda/lib/mailquota.c
-+++ b/mda/lib/mailquota.c
-@@ -270,16 +270,10 @@ sql_retrieve_quota (char *name, mu_off_t *quota)
- 	}
-       else if (tmp == NULL || tmp[0] == 0 || mu_c_strcasecmp (tmp, "none") == 0)
- 	rc = RETR_UNLIMITED;
--      else
-+      else if (get_quota (quota, tmp)) 
- 	{
--	  char *p;
--	  
--	  if (get_size (tmp, quota, &p))
--	    {
--	      mu_error (_("bogus mailbox quota for `%s' (near `%s')"),
--			name, p);
--	      *quota = groupquota;
--	    }
-+	  *quota = groupquota;
-+	  rc = RETR_OK;
- 	}
-     }
-   
--- 
-cgit v1.2.1
-
diff --git a/net-mail/mailutils/mailutils-3.10.ebuild b/net-mail/mailutils/mailutils-3.10.ebuild
deleted file mode 100644
index 7a8971fad43d..000000000000
--- a/net-mail/mailutils/mailutils-3.10.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit autotools elisp-common eutils flag-o-matic python-single-r1 toolchain-funcs
-
-DESCRIPTION="A useful collection of mail servers, clients, and filters"
-HOMEPAGE="https://www.gnu.org/software/mailutils/mailutils.html"
-SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos"
-IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
-	ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd \
-	tokyocabinet"
-
-RDEPEND="!mail-client/nmh
-	!mail-filter/libsieve
-	!mail-client/mailx
-	!mail-client/nail
-	sys-libs/ncurses:=
-	sys-libs/readline:=
-	dev-libs/libltdl:0
-	virtual/mta
-	berkdb? ( sys-libs/db:= )
-	bidi? ( dev-libs/fribidi )
-	emacs? ( >=app-editors/emacs-23.1:* )
-	gdbm? ( sys-libs/gdbm:= )
-	guile? ( dev-scheme/guile:12/2.2-1 )
-	kerberos? ( virtual/krb5 )
-	kyotocabinet? ( dev-db/kyotocabinet )
-	ldap? ( net-nds/openldap )
-	mysql? ( dev-db/mysql-connector-c )
-	nls? ( sys-devel/gettext )
-	pam? ( sys-libs/pam )
-	postgres? ( dev-db/postgresql:= )
-	python? ( ${PYTHON_DEPS} )
-	sasl? ( virtual/gsasl )
-	servers? ( virtual/libiconv dev-libs/libunistring )
-	ssl? ( net-libs/gnutls:= )
-	tcpd? ( sys-apps/tcp-wrappers )
-	tokyocabinet? ( dev-db/tokyocabinet )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-	servers? ( tcpd ldap )"
-
-DOCS=( ABOUT-NLS AUTHORS COPYING COPYING.LESSER ChangeLog INSTALL NEWS README THANKS TODO )
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.5-add-include.patch
-	"${FILESDIR}"/${PN}-3.10-get_size.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	if use mysql; then
-		sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \
-			sql/Makefile.am || die
-	fi
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-
-	# maildir is the Gentoo default
-	econf MU_DEFAULT_SCHEME=maildir \
-		CURSES_LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" \
-		$(use_with berkdb berkeley-db) \
-		$(use_with bidi fribidi) \
-		$(use_enable ipv6) \
-		$(use_with gdbm) \
-		$(use_with sasl gsasl) \
-		$(use_with guile) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with mysql) \
-		$(use_enable nls) \
-		$(use_enable pam) \
-		$(use_with postgres) \
-		$(use_enable python) \
-		$(use_with ssl gnutls) \
-		$(use_enable static-libs static) \
-		$(use_enable threads pthread) \
-		$(use_with tokyocabinet) \
-		$(use_with kyotocabinet) \
-		$(use_with tcpd tcp-wrappers) \
-		$(use_enable servers build-servers) \
-		$(use_with servers unistring ) \
-		$(use_enable clients build-clients) \
-		EMACS=$(usex emacs emacs no) \
-		--with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
-		--with-mail-spool=/var/spool/mail \
-		--with-readline \
-		--enable-sendmail \
-		--disable-debug
-}
-
-src_install() {
-	default
-
-	insinto /etc
-	# bug 613112
-	newins "${FILESDIR}/mailutils.rc" mailutils.conf
-	keepdir /etc/mailutils.d/
-	insinto /etc/mailutils.d
-	doins "${FILESDIR}/mail"
-
-	if use python; then
-		python_optimize
-		if use static-libs; then
-			rm -r "${D}$(python_get_sitedir)/mailutils"/*.{a,la} || die
-		fi
-	fi
-
-	if use servers; then
-		newinitd "${FILESDIR}"/imap4d.initd imap4d
-		newinitd "${FILESDIR}"/pop3d.initd pop3d
-		newinitd "${FILESDIR}"/comsatd.initd comsatd
-	fi
-
-	# compatibility link
-	if use clients && use split-usr; then
-		dosym ../usr/bin/mail /bin/mail
-	fi
-
-	if ! use static-libs; then
-		find "${D}" -name "*.la" -delete || die
-	fi
-}
diff --git a/net-mail/mailutils/mailutils-3.11.ebuild b/net-mail/mailutils/mailutils-3.12.ebuild
index df0dac0e2b63..5376eb73d090 100644
--- a/net-mail/mailutils/mailutils-3.11.ebuild
+++ b/net-mail/mailutils/mailutils-3.12.ebuild
@@ -72,7 +72,8 @@ src_configure() {
 	append-flags -fno-strict-aliasing
 
 	# maildir is the Gentoo default
-	econf MU_DEFAULT_SCHEME=maildir \
+	econf \
+		MU_DEFAULT_SCHEME=maildir \
 		CURSES_LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" \
 		$(use_with berkdb berkeley-db) \
 		$(use_with bidi fribidi) \