commit: a25b0e4e4143608bc86450b5db990cf3c4254ae1 Author: Eray Aslan <eras <AT> gentoo <DOT> org> AuthorDate: Thu May 19 16:34:53 2022 +0000 Commit: Eray Aslan <eras <AT> gentoo <DOT> org> CommitDate: Thu May 19 16:34:53 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a25b0e4e
net-mail/mailutils: drop 3.12-r4, 3.13-r1 Signed-off-by: Eray Aslan <eras <AT> gentoo.org> net-mail/mailutils/Manifest | 2 - .../files/mailutils-3.12-disable_escapes.patch | 24 ---- .../files/mailutils-3.12-fix-big-endians.patch | 26 ---- .../files/mailutils-3.12-misssing-endif.patch | 23 ---- net-mail/mailutils/mailutils-3.12-r4.ebuild | 144 --------------------- net-mail/mailutils/mailutils-3.13-r1.ebuild | 141 -------------------- 6 files changed, 360 deletions(-) diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest index 4d73c53e3cd2..3d9fb2486140 100644 --- a/net-mail/mailutils/Manifest +++ b/net-mail/mailutils/Manifest @@ -1,4 +1,2 @@ -DIST mailutils-3.12.tar.xz 3134484 BLAKE2B eac7934e9332482adffa3d4b1574d89a65949644ca8dd14e507e9c5f268d485b97f4d61deadf34b2ddcae1b91deee93372e9ebd53c88a0c0092346a0d83fd67e SHA512 a7d681bc7a763b7f09b704c8a536ea1c2444c52ca736eca321ca72fd32e2e62c0e14687ba79654d9162d45189d0621b1c75c639b81e04a79bbf3b3c09b9cebd2 -DIST mailutils-3.13.tar.xz 3152892 BLAKE2B cd7d9ce0391d85482581eeb52f60fcc175647d21e433a4dacee3547aa4dcd710331ad780b6706c242d1a7501ec7fc50ff0c25f9b5f4ceeed84893c637ca366c1 SHA512 fd0b23aa535c6446af1ae633d68d41d1aa243d489b2623d346f6a0d6b543c43ab6c2b9bb1449d664abacbcd3ec3a0a5e7a0a5d56d2762e8a961544c77ccc592a DIST mailutils-3.14.tar.xz 3215944 BLAKE2B 64965c177065eacab9f5545fbeacd538492995f808dab731d02acbe7d63161f3bfb1528a0ca71e30c32ba12edc7e4f68642f2e5154b66d3bb48c479cae95c754 SHA512 9797deb8901d03a231c3503d75a758fbfb1220d1e064dd8be74735e6c88aa04c94533e802a60fdfbe12f1bd7daec4a39249cd957b103f09b89df364bd9a8869d DIST mailutils-3.15.tar.xz 3112212 BLAKE2B 78101178c101897bc75897a1e134796150fafccd7e8f4b603c82698dd0cd27a98dd1ed7837a87be4760e8bdb39ec7275023a8e2847f832e683b8e97e5e95d75d SHA512 b6b90ad4f71c83e500a9b176694f5fb51a99baf26e52d567d222d6f037a23a0814ac84f88762cbfb4f22382c0e662191af89fb74a8a287134b8fffa58086bdd8 diff --git a/net-mail/mailutils/files/mailutils-3.12-disable_escapes.patch b/net-mail/mailutils/files/mailutils-3.12-disable_escapes.patch deleted file mode 100644 index 073d1b671219..000000000000 --- a/net-mail/mailutils/files/mailutils-3.12-disable_escapes.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 4befcfd015256c568121653038accbd84820198f Mon Sep 17 00:00:00 2001 -From: Sergey Poznyakoff <[email protected]> -Date: Mon, 19 Jul 2021 11:27:40 +0300 -Subject: mail: disable compose escapes in non-interctive mode. - -diff --git a/mail/send.c b/mail/send.c -index 1bdfe1134..098374dab 100644 ---- a/mail/send.c -+++ b/mail/send.c -@@ -1324,8 +1324,9 @@ mail_compose_send (compose_env_t *env, int save_to) - - if (strcmp (buf, ".") == 0 && mailvar_is_true (mailvar_name_dot)) - done = 1; -- else if (mailvar_get (&escape, mailvar_name_escape, -- mailvar_type_string, 0) == 0 -+ else if (interactive -+ && mailvar_get (&escape, mailvar_name_escape, -+ mailvar_type_string, 0) == 0 - && buf[0] == escape[0]) - { - if (buf[1] == buf[0]) --- -cgit v1.2.1 - 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 deleted file mode 100644 index 5dd2f8f035d1..000000000000 --- a/net-mail/mailutils/files/mailutils-3.12-fix-big-endians.patch +++ /dev/null @@ -1,26 +0,0 @@ -From c0af3be2fcee73c1a61f58572ecef1ef3f385015 Mon Sep 17 00:00:00 2001 -From: Sergey Poznyakoff <[email protected]> -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 deleted file mode 100644 index 12d03af7b337..000000000000 --- a/net-mail/mailutils/files/mailutils-3.12-misssing-endif.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 4cc284cfb38306989694a7828e880f0cf6d0c4e0 Mon Sep 17 00:00:00 2001 -From: Sergey Poznyakoff <[email protected]> -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.12-r4.ebuild b/net-mail/mailutils/mailutils-3.12-r4.ebuild deleted file mode 100644 index c4e8479b9649..000000000000 --- a/net-mail/mailutils/mailutils-3.12-r4.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9,10} ) - -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 ~riscv ~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-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? ( 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}" - -BDEPEND="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 - "${FILESDIR}"/${P}-disable_escapes.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.13-r1.ebuild b/net-mail/mailutils/mailutils-3.13-r1.ebuild deleted file mode 100644 index d2d6db7cf078..000000000000 --- a/net-mail/mailutils/mailutils-3.13-r1.ebuild +++ /dev/null @@ -1,141 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9,10} ) - -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 ~riscv ~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-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? ( 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}" - -BDEPEND="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 -) - -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 -}
