gentoo resync : 21.09.2018

7 files changed, 144 insertions, 87 deletions

diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 0967e569aba8..43710fbd57fd 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index 5d2da45fd282..4a6462c27062 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -15,5 +15,6 @@ DIST mailutils-3.4.tar.xz 2619672 BLAKE2B 3a49c319a7171b2659477e6892ae222a342243
 EBUILD mailutils-3.1.1.ebuild 3575 BLAKE2B 27de93350eca9d9ca3c8503ebc3b78ad1661c5b09458cb16835e84c8848b6d818d965ba0c4c1ebaaec3a87bc714c13a056598a1f079da59cf98619ee3b41b610 SHA512 3fa3501b885b254bfaf86786d67a3177f0756cb0346ba630dc9b902c851ceb708abce1057d326de769704ff50d713859f0280433b384a6f17b016a4045d05570
 EBUILD mailutils-3.4-r1.ebuild 3530 BLAKE2B ee9410a41c7e34e425e6c40c09e244c2d739b4cea8063f35090cbbf38ef14815be43de60d4c96b4856c5979f9f7ea0589d16f9c4db11837d2650c76f41fef4d8 SHA512 d08a536c05c6301555750e5ea4139b524aa1f71b99fd1b25b462c710695a3b976c1267a05448386d773650fba524cdc79c4131cb6dc44c0729cc3bfe5cb0e4a6
 EBUILD mailutils-3.4-r2.ebuild 3532 BLAKE2B e81fb4acdc0fff627e6e54222217485854de167f7a3d9f4b91d4b774f1a3ed919065ea08429a7cfbb80b180a2f8e77ea0fcbf668b7f5ef5c343edb8dd4409168 SHA512 6faf7e29b1464272a3fbd93290fdee06366b41f0297acd44bb7c5e2d2e5a1efb2e91952868a46302d769b21848610401f314d21037d5dd79cd22675059978665
+EBUILD mailutils-3.4-r3.ebuild 3662 BLAKE2B 520d119bdc9c6a79a14256aad74a286802cd9ac690b972058b2a240120e6f9802929daf170d000595a1d2fad076e5921714c96840ebacffde3b1d1effbdf622a SHA512 53f308c6bcf435cffa7030e58fc0f0becfd56ee21b75227cf567a26ca814f6380cdc1fa3cfae63d7e96fde22149dd29032925c11973b5c573c2ae4c90edaea3d
 EBUILD mailutils-3.4.ebuild 3480 BLAKE2B efeab718e516c9c89cf6c638b75d85fb15f39fc11fa9da4f4e22289565531a20c2bd1d7665f9c4621c5d19be7ebb8c7a78e624263a7746e33159c8763582d019 SHA512 7f6b384b5a0a227ec4fd18f5cb4f9797b588013d0897e5d62d878e6e6e703c84a5d7a06f164df38a7c8faf3b3aae8994b0e13171acd6d704eab891cc0f871cc7
 MISC metadata.xml 598 BLAKE2B fce383bd86c8e43d7b9164abae6127ddc98b606b6a5e4afd17826f6a3fb683f92120d8c7877d250196bab51bfb37ab33454d3cfaeffd0b7a69a001481510f9a4 SHA512 16f2b6b082da7c932457df31809c8ca1caca1f8439037f56b5751c28cf1217658ed60fd4155871d4d5d71e7040c01edbe37198dee27beeae1905da954317c8e7
diff --git a/net-mail/mailutils/mailutils-3.4-r3.ebuild b/net-mail/mailutils/mailutils-3.4-r3.ebuild
new file mode 100644
index 000000000000..ff55ff32e352
--- /dev/null
+++ b/net-mail/mailutils/mailutils-3.4-r3.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+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="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
+	ldap mysql nls pam postgres python servers 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? ( virtual/emacs )
+	gdbm? ( sys-libs/gdbm )
+	guile? ( dev-scheme/guile:12/22 )
+	kerberos? ( virtual/krb5 )
+	kyotocabinet? ( dev-db/kyotocabinet )
+	ldap? ( net-nds/openldap )
+	mysql? ( virtual/mysql )
+	nls? ( sys-devel/gettext )
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql:= )
+	python? ( ${PYTHON_DEPS} )
+	sasl? ( virtual/gsasl )
+	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 )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Disable bytecompilation of Python modules.
+	echo "#!/bin/sh" > build-aux/py-compile
+	eapply "${FILESDIR}/${P}-MH-testsuite.patch" \
+		"${FILESDIR}/${P}-fix-endianness.patch"
+	# add missing tests so that make check doesn't fail
+	cp "${FILESDIR}"/{hdr,nohdr,twomsg,weed}.at "${S}"/readmsg/tests || die
+	if use mysql; then
+		sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \
+			sql/Makefile.am || die
+	fi
+	eapply_user
+	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_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 \
+		--disable-rpath
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	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
+
+	dodoc AUTHORS ChangeLog NEWS README* THANKS TODO
+
+	# compatibility link
+	use clients && dosym /usr/bin/mail /bin/mail
+
+	use static-libs || find "${D}" -name "*.la" -delete
+}
diff --git a/net-mail/mlmmj/Manifest b/net-mail/mlmmj/Manifest
index ef06033d48d6..b59b5c6741d0 100644
--- a/net-mail/mlmmj/Manifest
+++ b/net-mail/mlmmj/Manifest
@@ -1,9 +1,6 @@
 AUX mlmmj-1.2.19.0-listcontrol-customheaders.patch 1231 BLAKE2B 8726f9436c7536ae3cd3c2970fd73420d7ad3258d24aa893a6ec9a00439c3e854fb6e7c3dc671857a89c0196a81e9eb68fb51cee112101cec3c14a5ad36a46b3 SHA512 d6e55a1697ab44ea526c0f24930e0aebe088a9f6e2f6726b9557f350fb0b8f86b11441eea3c389593bbaa5e592c97c71b664dba8a3b4eaeb899e318e90d11114
-DIST mlmmj-1.2.18.0.tar.bz2 240571 BLAKE2B ad71178da031fcdbfe5002d542c3bc6e4f49c706c80b8439f15c363eb8f72264d4dafa15aaef32bc99e85d0397b52d43e30dddf42b00674642545af8a959fdfc SHA512 f40fbb8a8ee5312ac6d6baa32065205b768b1ad2a16b8622e6316723d64ceb118cd6d3c0f64929d610596433e1ccb1082c23ea8ad69ca004a6b563da72bd8cc6
-DIST mlmmj-1.2.18.1.tar.bz2 240942 BLAKE2B cfd5432b895f7c096a78ef9b522576de68f4fb4f2b016839b31e10bffeb45725aed701c557d64dd1cb271f5d977746983cb624b0c00f9f6fb26f2b7d6df575c4 SHA512 755af623054daac31dfb3de20c017422c40f7fed42c141c5d398c2bd4d5deb8975db556af53f3e5e0711a83a260d7bf3017e27c4fd399a792190de683c470b72
 DIST mlmmj-1.2.19.0.tar.bz2 284701 BLAKE2B a145b742a6024447d107b40bdd4072c1933069493360600161a3f585575a8cf2252393d53e8a66c0702301f148d73df7173b50234818bac4ae5b2269ff42f72b SHA512 c0f23b434941bfb5bfcb9a0f292edcfa62c9bb357014d41f82b03bd8ed1a951e3c8f09293dd333030b024d3da82c514de789b8916cc3c0f493ad8fefbe3a3afb
-EBUILD mlmmj-1.2.18.0.ebuild 917 BLAKE2B 7a45ba415072500b155494250642632442ad94450f75252b45a5de37b3d2282cb68a2696332b7663dfadde4038182b0f0f6b0213d9d0ba8e79c0df55e3bcbb58 SHA512 cac67bbf94039c54bbbe7f54110e29c834285e7343735abf6b079a04398005627cebecc6c058b5e502e485c8a8dc2b9d53e751cb0c72f7eb9ec8eb62b7972f7b
-EBUILD mlmmj-1.2.18.1.ebuild 920 BLAKE2B 2de474310522f09c5346b9a46f0e38c785e8a7e02ca1bf0eaef43ed327d5e30a8312138d3b3df603240080d04c94cd9f30afcbd7975df389e942aecb1f369d57 SHA512 fb0b2717db5edb0cac448bd51155c4584db146535bb043a061d211044ccad1c92b716f69632b8d75830c8ccea7e418a8307c3d1f308b284c121394a6eacfa470
+DIST mlmmj-1.3.0.tar.bz2 292519 BLAKE2B abaf5c7ad53034d2201a2d3ba6d7f99ca83f47ec83df59e12a90a7118fbbde941d5ed2d14864a4af1568f67e74ea082fbc70fc9e44390673b76377bb3679c817 SHA512 c704d89f8a96c0ffc751a744ffdefb5e4304ab74be89292f06ce0c337b8ff1cc5a91737c8b1bd96fe3e993338986fa42bf360cfefc508e1eac74ab88ffda2494
 EBUILD mlmmj-1.2.19.0-r1.ebuild 991 BLAKE2B eb491ba912a45592cbd24a63c495702ac9f0bdf2ad41db9e7d0cb13b0928b5a5398a3b303f908ff3e17451f2621d17982f30c8be4ea83a30b42fd2798d1c6cc2 SHA512 5f2df9329d2f98ac3d531cdf706283cce3a3637bef5a02867e41b5bf66de7dfa64c649c95a060f4635dd34dbb229a3f6ee431e9e268deea3605030622dd5a0c2
-EBUILD mlmmj-1.2.19.0.ebuild 920 BLAKE2B 2dc393c2cf44cc24d0252e1a2283fc9203f9432773448f099ad654e5856a0e510f5005be1aa20d4e4341787740c8071f955ff754c205df79285aa7dd51606277 SHA512 8ff820c48a87f797e13a651da7e18d82a7eeb0ed68213242239d98d9ad463dce3166380ceed9617a510e2510591c370a8576f64924ba319e70a68ff9c0a08a05
+EBUILD mlmmj-1.3.0.ebuild 994 BLAKE2B a3bf2ac06a899856a33dff5c1bee54b2a98a50f272fb8450c105d136f552b06a582ef81509cd121d0898216431032a4b35ec6f9f4ff964a14b66a8d8e2ad2a04 SHA512 d80921b01c315a14e34b34ab3b0c6de8765527893020ebffc5151fba888c22bc176e5ebe0bcf8911b12b56a63bef45618aeab690df1300d3d0e4fb1fc4014d1b
 MISC metadata.xml 240 BLAKE2B eeb6099e7ebc29b81588528b970830d2461fa16783bda673672d405615e46d240dcd806b3d18b6207ef8e5365f8860aa20c304394c3f5b267c5ea4dc739cb94b SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db
diff --git a/net-mail/mlmmj/mlmmj-1.2.18.0.ebuild b/net-mail/mlmmj/mlmmj-1.2.18.0.ebuild
deleted file mode 100644
index 9e589d0d5534..000000000000
--- a/net-mail/mlmmj/mlmmj-1.2.18.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-MY_PV="${PV/_rc/-RC}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="Mailing list managing made joyful"
-HOMEPAGE="http://mlmmj.org/"
-SRC_URI="http://mlmmj.org/releases/${MY_P}.tar.bz2"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-DEPEND="virtual/mta"
-S="${WORKDIR}/${MY_P}"
-
-DOCS="AUTHORS ChangeLog FAQ README* TODO TUNABLES UPGRADE"
-
-src_configure() {
-	econf --enable-receive-strip
-}
-
-src_install() {
-	default
-
-	insinto /usr/share/mlmmj/texts
-	doins listtexts/*
-
-	insinto /usr/share/mlmmj
-	doins -r contrib/web/*
-}
-
-pkg_postinst() {
-	elog "mlmmj comes with serveral webinterfaces:"
-	elog "- One for user subscribing/unsubscribing"
-	elog "- One for admin tasks"
-	elog "both available in a php and perl module."
-	elog "For more info have a look in /usr/share/mlmmj"
-}
diff --git a/net-mail/mlmmj/mlmmj-1.2.19.0.ebuild b/net-mail/mlmmj/mlmmj-1.2.19.0.ebuild
deleted file mode 100644
index b0c02c35f4d5..000000000000
--- a/net-mail/mlmmj/mlmmj-1.2.19.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-MY_PV="${PV/_rc/-RC}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="Mailing list managing made joyful"
-HOMEPAGE="http://mlmmj.org/"
-SRC_URI="http://mlmmj.org/releases/${MY_P}.tar.bz2"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-DEPEND="virtual/mta"
-S="${WORKDIR}/${MY_P}"
-
-DOCS="AUTHORS ChangeLog FAQ README* TODO TUNABLES UPGRADE"
-
-src_configure() {
-	econf --enable-receive-strip
-}
-
-src_install() {
-	default
-
-	insinto /usr/share/mlmmj/texts
-	doins listtexts/*
-
-	insinto /usr/share/mlmmj
-	doins -r contrib/web/*
-}
-
-pkg_postinst() {
-	elog "mlmmj comes with serveral webinterfaces:"
-	elog "- One for user subscribing/unsubscribing"
-	elog "- One for admin tasks"
-	elog "both available in a php and perl module."
-	elog "For more info have a look in /usr/share/mlmmj"
-}
diff --git a/net-mail/mlmmj/mlmmj-1.2.18.1.ebuild b/net-mail/mlmmj/mlmmj-1.3.0.ebuild
index b770d08ecbbb..66a6bc8a1e10 100644
--- a/net-mail/mlmmj/mlmmj-1.2.18.1.ebuild
+++ b/net-mail/mlmmj/mlmmj-1.3.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=6
 
 MY_PV="${PV/_rc/-RC}"
 MY_P="${PN}-${MY_PV}"
@@ -16,6 +16,9 @@ DEPEND="virtual/mta"
 S="${WORKDIR}/${MY_P}"
 
 DOCS="AUTHORS ChangeLog FAQ README* TODO TUNABLES UPGRADE"
+PATCHES=(
+	"${FILESDIR}"/mlmmj-1.2.19.0-listcontrol-customheaders.patch
+)
 
 src_configure() {
 	econf --enable-receive-strip