gentoo auto-resync : 08:01:2025 - 06:41:21

3 files changed, 227 insertions, 0 deletions

diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index fb4b49fb0208..0a1d5160e4cb 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -2,8 +2,11 @@ AUX comsatd.initd 569 BLAKE2B 1b4ad287b67ef6d95fbc626296e79a857264754159967c5410
 AUX imap4d.initd 566 BLAKE2B 2d030e47f63b4133eed4b47c9069c54de290f907d9429eb99675380569e1e0efdbb1172664ba1ee0f2924ac7284981fbe350d1543a6d0790722456523d997535 SHA512 51d6cf4285c6823d97e52c7eb408a80aa66376f329685acdc21e096c2099a044b2fd18e7b9e5ed89406a3cd1f16b7aa7b0243f8ea46aa7824da48b566ec00324
 AUX mail 82 BLAKE2B 6d9cc293deff8f99cea0ce8842dd34e658844ca9a1f4e530d3c95f8154ed337ab6ccc2b6263af9cfa8078913a7b70beb5874c999174d5648c1faeace8f68e146 SHA512 80080a3118ed66cfde44ad3663e4b07bcd5fe756b86a213ea4e1ab86e27f8485dcf02af3ee6b7f6f12105a267b9619376668e0cb6e60743ffb7664d2dbea9144
 AUX mailutils-3.5-add-include.patch 275 BLAKE2B 2502fb3226bc63ae98d018392fa1107b4079ea51cd8e57b4e97522d21e696bd6048fad2de885f88644d23f434a6e407f42ba8fcbcfe5b1e65884f37718e34328 SHA512 0972cde536a1a82fe243c9b048fc15f4863586a2344b54c9b4f6f8a5935762c7272c0af2698239af7de9da62b1c2928bc7f621e01f447423fdd8288cedee88b6
+AUX mailutils-skip-mbox-tests.patch 2180 BLAKE2B 09e76e2d792eae9fea6f80f1c7d0249a3a3f2e675ccf795b5d9b826c2994fa29fba0c6a81ca2355cd0cbdaa0e7683b4ac79b8ab956138bc1e136ed02a13aeecf SHA512 26b54566633a44da6582425259001f75892379f3f6074a5f7e6513ea844abfde4430b8d56adb0f494ecf994b50964ffce6797d21924d242861dd184359e335dc
 AUX mailutils.rc 258 BLAKE2B 3dc68190e11c8bf5016b0fe8b22c61f79ba7de96a1f230f7d0743ba23fa903cb9f99fac94a7363c7d80b7bbaf76e2d4de848e7ac726642fb23c56caf43a46568 SHA512 691bcc81fd355d8f2776e72006c149996273579e099f24970ff0c5dd6bdf65cd64e31597f8b3d8e0a900a91c3325b8d2a1a96682a9b3ff53acd41218fe8721fe
 AUX pop3d.initd 563 BLAKE2B fd09d7a7499c888eddfb812644102f979c2423e9b1a9f0077655b6ae4c1eb4214f685ef7843e74a808e52ee988cc3fbefa278754db824256a4972c83fc0ada31 SHA512 7847c29a03f21df82d36c077ccb38329457a332cccdfba24bee3b1c9a8170fc71c07ee674408f069693953dd1bf44b8b8f782dcc35d6b16e62f70b2b32ce018f
 DIST mailutils-3.17.tar.xz 3219484 BLAKE2B b2b00d4eb8b74b3f2f7341638639fef79e636364deaa0a24c9595022db44faac433c1fa26b231e29384ebdfc9c1602040cf363e637fc66ec3a738b5bd04a884a SHA512 e4080d9674444c3e077aa72f825a0373a4750d187a04a488449e89f6fec19d9309a118412e91745575eb90d05fa541f8d2626a8fd5e8ac10710aa1f7a0ff3193
+DIST mailutils-3.18.tar.xz 3294996 BLAKE2B 7866a9c0419daaeaf277f266893030cda771804c636ce143e36a9cd1823280c2662b0696825387b3b0727115e0ab131ca376bd99445d4b4080f66289dca11316 SHA512 77718e41d77556b59d7eeee4b80fca658c32f949dd87e09848a559eb6470254c9562208e49b62e5027522eebb5eaaf7eb9dc12ec02424f4144cceee5ef695ca9
 EBUILD mailutils-3.17-r100.ebuild 4035 BLAKE2B c461acf681d90887304d87bdb1cb531346e5b23cf1c855e08ad0f1405daec1333c057c6f7663aa200fdafdad68c1514ff8a712de2cd826f0565b72674c77111b SHA512 7645bdd490b5ebc2478477b23428f80a4327fb9bb4efd924411209921ab7c000edece50216f3f571e41298373d5577de27fd33306f24fbc3277bc71f946cf945
+EBUILD mailutils-3.18.ebuild 4085 BLAKE2B f7c2f644328ee760730e63c0a70bbe44d39133c3746505d6f9cd2c2e1eba9779270945927220498f21c47100861b913249ee95505ee4bc18351912d9588a5fd4 SHA512 321557958c680e39b34a94110d58b9e41c311d466e51bd3dfd5bcb463953a9ca2259e192624760f7e5c959f1203de15bac3951e35b55051dd1e39eae2b4c705a
 MISC metadata.xml 696 BLAKE2B bb3b5a94573794ee2eb692533f32cba1dcf432166d9b2997cf60104d88e80f5eac7bb836479e4392700b06efe07c071930308183fb235c42be2cf1fdb8810ac0 SHA512 bb093e2aff71bb09a8f20fc64926f8a8d8c036ad3b3cd3ca61389975d623251841e8d93489f457a56a898db81cf71ecdc071190b9bc1990728b3fa0c9b4cfda1
diff --git a/net-mail/mailutils/files/mailutils-skip-mbox-tests.patch b/net-mail/mailutils/files/mailutils-skip-mbox-tests.patch
new file mode 100644
index 000000000000..1443e66ecce1
--- /dev/null
+++ b/net-mail/mailutils/files/mailutils-skip-mbox-tests.patch
@@ -0,0 +1,60 @@
+diff --git a/mail/testsuite/mail/Followup.exp b/mail/testsuite/mail/Followup.exp
+index c9f9d11..a7927e9 100644
+--- a/mail/testsuite/mail/Followup.exp
++++ b/mail/testsuite/mail/Followup.exp
+@@ -17,7 +17,9 @@
+ 
+ mail_version
+ 
+-if ![mu_check_capability ENABLE_SENDMAIL] {
++if { [mu_check_capability SCHEME] == "maildir" } {
++    unsupported "Does not work when default mailbox type is maildir"
++} elseif ![mu_check_capability ENABLE_SENDMAIL] {
+     unsupported "Support for sendmail not compiled in"
+ } else {
+     mail_start "--file=%teaparty.mbox" \
+diff --git a/mail/testsuite/mail/Reply.exp b/mail/testsuite/mail/Reply.exp
+index c492aee..543a857 100644
+--- a/mail/testsuite/mail/Reply.exp
++++ b/mail/testsuite/mail/Reply.exp
+@@ -17,7 +17,9 @@
+ 
+ mail_version
+ 
+-if ![mu_check_capability ENABLE_SENDMAIL] {
++if { [mu_check_capability SCHEME] == "maildir" } {
++    unsupported "Does not work when default mailbox type is maildir"
++} elseif ![mu_check_capability ENABLE_SENDMAIL] {
+     unsupported "Support for sendmail not compiled in"
+ } else {
+     mail_start "--file=%teaparty.mbox" \
+diff --git a/mail/testsuite/mail/followup.exp b/mail/testsuite/mail/followup.exp
+index ca15317..ce042b5 100644
+--- a/mail/testsuite/mail/followup.exp
++++ b/mail/testsuite/mail/followup.exp
+@@ -17,7 +17,9 @@
+ 
+ mail_version
+ 
+-if ![mu_check_capability ENABLE_SENDMAIL] {
++if { [mu_check_capability SCHEME] == "maildir" } {
++    unsupported "Does not work when default mailbox type is maildir"
++} elseif ![mu_check_capability ENABLE_SENDMAIL] {
+     unsupported "Support for sendmail not compiled in"
+ } else {
+     mail_start "--file=%teaparty.mbox" \
+diff --git a/mail/testsuite/mail/reply.exp b/mail/testsuite/mail/reply.exp
+index 8d66e99..7b178b3 100644
+--- a/mail/testsuite/mail/reply.exp
++++ b/mail/testsuite/mail/reply.exp
+@@ -17,7 +17,9 @@
+ 
+ mail_version
+ 
+-if ![mu_check_capability ENABLE_SENDMAIL] {
++if { [mu_check_capability SCHEME] == "maildir" } {
++    unsupported "Does not work when default mailbox type is maildir"
++} elseif ![mu_check_capability ENABLE_SENDMAIL] {
+     unsupported "Support for sendmail not compiled in"
+ } else {
+     mail_start "--file=%teaparty.mbox" \
diff --git a/net-mail/mailutils/mailutils-3.18.ebuild b/net-mail/mailutils/mailutils-3.18.ebuild
new file mode 100644
index 000000000000..3f9ac446c933
--- /dev/null
+++ b/net-mail/mailutils/mailutils-3.18.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GUILE_COMPAT=( 2-2 3-0 )
+PYTHON_COMPAT=( python3_{11..13} )
+
+inherit autotools elisp-common flag-o-matic guile-single 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-3+ LGPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos"
+IUSE="berkdb bidi +clients emacs gdbm sasl guile kerberos kyotocabinet \
+	ldap mysql nls pam postgres python servers split-usr ssl static-libs test +threads tcpd \
+	tokyocabinet"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!mail-filter/libsieve
+	!mail-client/mailx
+	sys-libs/ncurses:=
+	sys-libs/readline:=
+	dev-libs/libltdl:0
+	virtual/libcrypt:=
+	virtual/mta
+	berkdb? ( sys-libs/db:= )
+	bidi? ( dev-libs/fribidi )
+	emacs? ( >=app-editors/emacs-23.1:* )
+	gdbm? ( sys-libs/gdbm:= )
+	guile? ( ${GUILE_DEPS} )
+	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? ( >=net-misc/gsasl-2.0.0 )
+	servers? ( virtual/libiconv dev-libs/libunistring:= )
+	ssl? ( net-libs/gnutls:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? ( dev-util/dejagnu )
+"
+
+REQUIRED_USE="
+	guile? ( ${GUILE_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}-skip-mbox-tests.patch
+)
+
+pkg_setup() {
+	use guile && guile-single_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	if use guile; then
+		guile_bump_sources
+		sed -i -e "s|guile|${GUILE}|" libmu_scm/tests/testsuite || die
+	fi
+	if use mysql; then
+		sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \
+			sql/Makefile.am || die
+	fi
+	eautoreconf
+}
+
+src_configure() {
+	# bug #943873
+	append-cflags -std=gnu17
+	append-flags -fno-strict-aliasing
+
+	if use guile; then
+		export GUILE_SNARF="${GUILESNARF}"
+		export GUILE_TOOLS="${GUILE/guile/guile-tools}"
+	fi
+
+	# 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_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-ipv6 \
+		--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"
+
+	use guile && guile_unstrip_ccache
+
+	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
+}