gentoo resync : 28.04.2021

8 files changed, 202 insertions, 9 deletions

diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index a7e214c57fd1..49fdb003e3aa 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -1,6 +1,8 @@
 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.12-fix-big-endians.patch 698 BLAKE2B 5d73570756063047633c82df2038c29999b3f9aaa48d7bfe58cf48c985107c43e36a717203b323506a9c8e24dfc579c218c2107e5a59de642290d3699a9c8867 SHA512 78af75afb332a47b4780ea1a1d67113e7e71febcff6044c8e9281e09017181309d1665da50010db1ccfebffd2c0d9ddd10e753a867c9aee9d99b67f9475ffce1
+AUX mailutils-3.12-misssing-endif.patch 689 BLAKE2B a54f086b1fccd4c5965ef849158e0e667f25abb6f095bd5e8aa63b53199e01327c3de33b43892da1eb1429dc0443a5133880bb27374f128a4f00e58d476a7740 SHA512 40dc7fe324014eadde44e55af2a2de4e474a2f6c2bd3a3fbea10446156b4505cf36c89c7458da74749ab276570f5bdbaddf842ac9cf289ca7e7a4888d463a5d0
 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
@@ -13,8 +15,9 @@ DIST mailutils-3.11.1.tar.xz 3129416 BLAKE2B f7a13bd1c545b051d213656bea52d9df640
 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.11.1.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
+EBUILD mailutils-3.11.1.ebuild 3603 BLAKE2B bfc535bd6cfa518cdf7216f2a13a42f3b79d2d7693db77c6dea31e92dc97730d9220bddaf4a95b36a524335b87a242422d84a5914c47b9eb91a4d8e23b041d4d SHA512 6ce4e9ae45f3e75e1b079b465dd5ba616410f02e92dce0b2f3d7de024b84f9e26e0855fcaccc9b423ecc1d37bc2155c84fc7093911c57a6462c4c8ee9bd52393
+EBUILD mailutils-3.12-r1.ebuild 3659 BLAKE2B b35996dec703365a90a655cc834949ef20c22e77feedf58b9a4628fb55f2a6d5e026fcd6fa36999bb3187d54b174922bc997deb5f46d1e3eadba87a5b94dd633 SHA512 9c4c814630d56060292cf6d545c134da0053ea1d80afddb0bc53d638a66c774b605044d168422d6e3a4e1f82451ff01516988964e42c4e41ea0ea31696df465d
+EBUILD mailutils-3.12.ebuild 3607 BLAKE2B 956b53415a8d9b9635a94175587386b9971f2ef9b505a614a25468bb02ab0368e68e9b71f7dd322c291a63a8408348d0e82fcee55f9151b9a8bd5d4a31aea71b SHA512 0bc33916fa673d415fb65e4fd0c7e7ee815770822924ff58b06ad5237ba65d442f2bc6319c6251339510fe7b8f82ed731a364d8a34b62c818d07cb4763cf5279
+EBUILD mailutils-3.8.ebuild 3715 BLAKE2B 41672aa3d57539d8b3bc57f6967749a6c1d7ae2db9639fcbb6fb7145588b200819caab9fb25f71adb58d164b0ed99142f58dd7700915202621c5e7035edbefe6 SHA512 95835164f4504c134c808054d32ce918fdeb0a7cd010fa527c81f73cbb5bc92f03090c536ba377d77ba7da1746c548375daeec6e1793947ec2a20936299d659b
+EBUILD mailutils-3.9.ebuild 3727 BLAKE2B 99ae2d238c552a1adb7907d2716020c8ef34ddb65db4d302b99e4bc192aaa30fc7e4ee6d0ff5d22a8c5878f40c6968105f8981062a2a250d46af172849c7b34b SHA512 9a5c17e89d901a9598ff9bb6845a5d6e95055391eebce6b8e0aa3b9f5364adfc2b22946aab77701f211ad4521956630ee924b8467ce808bada320652b11e218c
 MISC metadata.xml 602 BLAKE2B e29b6203ef727041c0bb5483d46ddbd256f55f40d26ff94008fc3869dea23036369029a168a5b31fe3da8ee9c529d8c1cd9d0004691670cb9bebe77ef4973270 SHA512 602ef10835b14c359ac19dbce157ef5c073acb52286f7349feb4b8ec3940899ea4dba9d77ad4d4a3d540d86576cfb9f46e502cb9e8aa60cecb4a2f4b0b6358da
diff --git a/net-mail/mailutils/files/mailutils-3.12-fix-big-endians.patch b/net-mail/mailutils/files/mailutils-3.12-fix-big-endians.patch
new file mode 100644
index 000000000000..5dd2f8f035d1
--- /dev/null
+++ b/net-mail/mailutils/files/mailutils-3.12-fix-big-endians.patch
@@ -0,0 +1,26 @@
+From c0af3be2fcee73c1a61f58572ecef1ef3f385015 Mon Sep 17 00:00:00 2001
+From: Sergey Poznyakoff <gray@gnu.org>
+Date: Thu, 15 Apr 2021 08:37:29 +0300
+Subject: Bugfix in mimeview testsuite
+
+* mimeview/tests/bf.c (write_byte): Fix type of the character buffer.
+---
+ mimeview/tests/bf.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mimeview/tests/bf.c b/mimeview/tests/bf.c
+index 6ccce848c..2e6b37e4a 100644
+--- a/mimeview/tests/bf.c
++++ b/mimeview/tests/bf.c
+@@ -68,7 +68,7 @@ write_string (FILE *fp, char *arg)
+ int
+ write_byte (FILE *fp, char *arg)
+ {
+-  int c;
++  char c;
+   if (strlen (arg) == 3
+       && (arg[0] == '\'' || arg[0] == '"'))
+     c = arg[1];
+-- 
+cgit v1.2.1
+
diff --git a/net-mail/mailutils/files/mailutils-3.12-misssing-endif.patch b/net-mail/mailutils/files/mailutils-3.12-misssing-endif.patch
new file mode 100644
index 000000000000..12d03af7b337
--- /dev/null
+++ b/net-mail/mailutils/files/mailutils-3.12-misssing-endif.patch
@@ -0,0 +1,23 @@
+From 4cc284cfb38306989694a7828e880f0cf6d0c4e0 Mon Sep 17 00:00:00 2001
+From: Sergey Poznyakoff <gray@gnu.org>
+Date: Thu, 15 Apr 2021 08:36:56 +0300
+Subject: Minor fix
+
+* include/mailutils/sys/streamtrans.h: Add missing #endif
+---
+ include/mailutils/sys/streamtrans.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/include/mailutils/sys/streamtrans.h b/include/mailutils/sys/streamtrans.h
+index 8a4727cee..c9c866013 100644
+--- a/include/mailutils/sys/streamtrans.h
++++ b/include/mailutils/sys/streamtrans.h
+@@ -25,3 +25,5 @@ struct _mu_streamtrans
+   struct _mu_stream base;      /* Superclass */
+   mu_stream_t transport;       /* Transport stream */
+ };
++
++#endif
+-- 
+cgit v1.2.1
+
diff --git a/net-mail/mailutils/mailutils-3.11.1.ebuild b/net-mail/mailutils/mailutils-3.11.1.ebuild
index df0dac0e2b63..09da4e0a5f06 100644
--- a/net-mail/mailutils/mailutils-3.11.1.ebuild
+++ b/net-mail/mailutils/mailutils-3.11.1.ebuild
@@ -39,7 +39,7 @@ RDEPEND="!mail-client/nmh
 	postgres? ( dev-db/postgresql:= )
 	python? ( ${PYTHON_DEPS} )
 	sasl? ( virtual/gsasl )
-	servers? ( virtual/libiconv dev-libs/libunistring )
+	servers? ( virtual/libiconv dev-libs/libunistring:= )
 	ssl? ( net-libs/gnutls:= )
 	tcpd? ( sys-apps/tcp-wrappers )
 	tokyocabinet? ( dev-db/tokyocabinet )"
diff --git a/net-mail/mailutils/mailutils-3.12-r1.ebuild b/net-mail/mailutils/mailutils-3.12-r1.ebuild
new file mode 100644
index 000000000000..723c6c00e3b5
--- /dev/null
+++ b/net-mail/mailutils/mailutils-3.12-r1.ebuild
@@ -0,0 +1,141 @@
+# 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://mailutils.org/"
+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}"/${P}-misssing-endif.patch
+	"${FILESDIR}"/${P}-fix-big-endians.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.12.ebuild b/net-mail/mailutils/mailutils-3.12.ebuild
index 5376eb73d090..3c4f06c8eef6 100644
--- a/net-mail/mailutils/mailutils-3.12.ebuild
+++ b/net-mail/mailutils/mailutils-3.12.ebuild
@@ -39,7 +39,7 @@ RDEPEND="!mail-client/nmh
 	postgres? ( dev-db/postgresql:= )
 	python? ( ${PYTHON_DEPS} )
 	sasl? ( virtual/gsasl )
-	servers? ( virtual/libiconv dev-libs/libunistring )
+	servers? ( virtual/libiconv dev-libs/libunistring:= )
 	ssl? ( net-libs/gnutls:= )
 	tcpd? ( sys-apps/tcp-wrappers )
 	tokyocabinet? ( dev-db/tokyocabinet )"
diff --git a/net-mail/mailutils/mailutils-3.8.ebuild b/net-mail/mailutils/mailutils-3.8.ebuild
index c26b8260a69a..6aed9177e6cd 100644
--- a/net-mail/mailutils/mailutils-3.8.ebuild
+++ b/net-mail/mailutils/mailutils-3.8.ebuild
@@ -39,7 +39,7 @@ RDEPEND="!mail-client/nmh
 	postgres? ( dev-db/postgresql:= )
 	python? ( ${PYTHON_DEPS} )
 	sasl? ( virtual/gsasl )
-	servers? ( virtual/libiconv dev-libs/libunistring )
+	servers? ( virtual/libiconv dev-libs/libunistring:= )
 	ssl? ( net-libs/gnutls:= )
 	tcpd? ( sys-apps/tcp-wrappers )
 	tokyocabinet? ( dev-db/tokyocabinet )"
diff --git a/net-mail/mailutils/mailutils-3.9.ebuild b/net-mail/mailutils/mailutils-3.9.ebuild
index 6353e86f2d9e..812b2d9dc8d9 100644
--- a/net-mail/mailutils/mailutils-3.9.ebuild
+++ b/net-mail/mailutils/mailutils-3.9.ebuild
@@ -12,7 +12,7 @@ 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"
+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"
@@ -39,7 +39,7 @@ RDEPEND="!mail-client/nmh
 	postgres? ( dev-db/postgresql:= )
 	python? ( ${PYTHON_DEPS} )
 	sasl? ( virtual/gsasl )
-	servers? ( virtual/libiconv dev-libs/libunistring )
+	servers? ( virtual/libiconv dev-libs/libunistring:= )
 	ssl? ( net-libs/gnutls:= )
 	tcpd? ( sys-apps/tcp-wrappers )
 	tokyocabinet? ( dev-db/tokyocabinet )"