commit:     d2998e34242de9c54019bfbb350829ca34e17ecc
Author:     Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 15 19:15:57 2025 +0000
Commit:     Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Mon Dec 15 19:16:24 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2998e34

net-mail/mailutils: drop 3.19, 3.20

Signed-off-by: Eray Aslan <eras <AT> gentoo.org>

 net-mail/mailutils/Manifest                        |   1 -
 .../files/mailutils-3.19-format-security.patch     |  36 -----
 net-mail/mailutils/mailutils-3.19.ebuild           | 163 ---------------------
 net-mail/mailutils/mailutils-3.20.ebuild           | 162 --------------------
 4 files changed, 362 deletions(-)

diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index bb5b84006e9b..d1ec08848643 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -1,4 +1,3 @@
 DIST mailutils-3.18.tar.xz 3294996 BLAKE2B 
7866a9c0419daaeaf277f266893030cda771804c636ce143e36a9cd1823280c2662b0696825387b3b0727115e0ab131ca376bd99445d4b4080f66289dca11316
 SHA512 
77718e41d77556b59d7eeee4b80fca658c32f949dd87e09848a559eb6470254c9562208e49b62e5027522eebb5eaaf7eb9dc12ec02424f4144cceee5ef695ca9
-DIST mailutils-3.19.tar.xz 3296536 BLAKE2B 
a9d7147b5ed1a7614ae284b8655b467364ca521dd1efe275dda8c8b512399c3044447a5b00263a5e1f5e74cf7a7d1a805b6f4a2d4f27fb0962269de490050f02
 SHA512 
2c92ead287433e13ac66ad07bcc1b726568a6fcbbc3d26a73f7d168947b226d8c56e7472a065f10391353adf494d27a9df21b3b9914d1d8f3b9c1618dbe491f9
 DIST mailutils-3.20.tar.xz 3314008 BLAKE2B 
d514017adbca6d087ad524ae1b29c2e1a4baa119cde515255633b008be05ddd83127edab6f312af5077c222f81362efa5ba8fcc4352aa06caa7b5c7c961e6fa0
 SHA512 
022913bec32903aaaa935a351e1626b84c202e16645038349952b69bc25723cc46116bc274d27e4eba3b15de5181f41769189d1f74e2ed35dccf5985b78db86c
 DIST mailutils-3.21.tar.xz 3381076 BLAKE2B 
395da966e7a290a53665a79f7984185cd73583c599d3b7d05a6b4ec1113fcaab5e526a3323cef36e75fa0eb0f26efdfb4f5874d1dbd633ee9a0a025a9e219140
 SHA512 
b006a0713d188d003c935b583ffa26284e79c05b808dbe4122aa0049cf0a6af9324ca8518f863aab507a9ac3b041b2cd1b88d9c10f9e6d6a000b8d83b2e22759

diff --git a/net-mail/mailutils/files/mailutils-3.19-format-security.patch 
b/net-mail/mailutils/files/mailutils-3.19-format-security.patch
deleted file mode 100644
index 2c49817a3b11..000000000000
--- a/net-mail/mailutils/files/mailutils-3.19-format-security.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 9379ec9e25ae6bdbd3d6f5ef9930ac2176d2efe7 Mon Sep 17 00:00:00 2001
-From: Jordi Mallach <[email protected]>
-Date: Wed, 5 Mar 2025 12:13:06 +0100
-Subject: Fix missing format arguments for builds with -Wformat-security
-
-libmailutils/diag/debug.c (mu_debug_format_spec): Add missing "%s" to
-printf to avoid triggering -Wformat-security.
----
- libmailutils/diag/debug.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libmailutils/diag/debug.c b/libmailutils/diag/debug.c
-index 2a1b52e..84c921a 100644
---- a/libmailutils/diag/debug.c
-+++ b/libmailutils/diag/debug.c
-@@ -511,7 +511,7 @@ mu_debug_format_spec (mu_stream_t str, const char *names, 
int flags)
-       {
-         if (delim)
-           {
--            rc = mu_stream_printf (str, delim);
-+            rc = mu_stream_printf (str, "%s", delim);
-             if (rc)
-               break;
-           }
-@@ -564,7 +564,7 @@ mu_debug_format_spec (mu_stream_t str, const char *names, 
int flags)
-       {
-         if (delim)
-           {
--            rc = mu_stream_printf (str, delim);
-+            rc = mu_stream_printf (str, "%s", delim);
-             if (rc)
-               break;
-           }
--- 
-cgit v1.1
-

diff --git a/net-mail/mailutils/mailutils-3.19.ebuild 
b/net-mail/mailutils/mailutils-3.19.ebuild
deleted file mode 100644
index c9d8f8669d3b..000000000000
--- a/net-mail/mailutils/mailutils-3.19.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# 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}-3.19-format-security.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
-
-       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
-}

diff --git a/net-mail/mailutils/mailutils-3.20.ebuild 
b/net-mail/mailutils/mailutils-3.20.ebuild
deleted file mode 100644
index 80d9045ad1fd..000000000000
--- a/net-mail/mailutils/mailutils-3.20.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# 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_{12..14} )
-
-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
-)
-
-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
-
-       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
-}

Reply via email to