commit: d48994bbf6debc510a3f8201f985796ac5480fbc Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr> AuthorDate: Fri Jan 23 11:31:20 2026 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Feb 11 02:52:31 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d48994bb
net-mail/email: fix c23, export CC AR, rm dupl. doc SRC_URI is unreachable, use mirror://gentoo Closes: https://bugs.gentoo.org/725028 Closes: https://bugs.gentoo.org/944203 Closes: https://bugs.gentoo.org/969062 Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr> Part-of: https://github.com/gentoo/gentoo/pull/45500 Closes: https://github.com/gentoo/gentoo/pull/45500 Signed-off-by: Sam James <sam <AT> gentoo.org> net-mail/email/email-3.1.3-r2.ebuild | 25 ++++++++++++++++++--- net-mail/email/files/email-3.1.3-ar_call.patch | 31 ++++++++++++++++++++++++++ net-mail/email/files/email-3.1.3-fix_c23.patch | 16 +++++++++++++ 3 files changed, 69 insertions(+), 3 deletions(-) diff --git a/net-mail/email/email-3.1.3-r2.ebuild b/net-mail/email/email-3.1.3-r2.ebuild index a8f0acd224d9..00407bed37b2 100644 --- a/net-mail/email/email-3.1.3-r2.ebuild +++ b/net-mail/email/email-3.1.3-r2.ebuild @@ -1,11 +1,13 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 +inherit autotools toolchain-funcs + DESCRIPTION="Advanced CLI tool for sending email" HOMEPAGE="https://github.com/deanproxy/eMail"; -SRC_URI="http://www.cleancode.org/downloads/${PN}/${P}.tar.bz2"; +SRC_URI="mirror://gentoo/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" @@ -14,10 +16,27 @@ KEYWORDS="~alpha amd64 x86" PATCHES=( "${FILESDIR}"/${PN}-3.1.3-fno-common.patch "${FILESDIR}"/${PN}-3.1.3-fix-clang16-configure.patch + "${FILESDIR}"/${PN}-3.1.3-fix_c23.patch + "${FILESDIR}"/${PN}-3.1.3-ar_call.patch ) +src_prepare() { + default + # dlib/configure.in patched to use AR + pushd dlib >/dev/null || die + eautoconf + popd >/dev/null || die +} + +src_configure() { + tc-export AR CC + default +} + src_install() { default doman email.1 - dodoc README TODO + + # remove duplicate man/docs + rm -r "${ED}"/usr/share/doc/${PF}/${P} || die } diff --git a/net-mail/email/files/email-3.1.3-ar_call.patch b/net-mail/email/files/email-3.1.3-ar_call.patch new file mode 100644 index 000000000000..ed2716c26eb2 --- /dev/null +++ b/net-mail/email/files/email-3.1.3-ar_call.patch @@ -0,0 +1,31 @@ +see https://bugs.gentoo.org/725028 +remove hardcoded ar +--- a/dlib/Makefile.in ++++ b/dlib/Makefile.in +@@ -3,6 +3,7 @@ + VERSION = @ver@ + SRCDIR = src/ + DESTDIR = ++AR= @AR@ + CC = @CC@ + CFLAGS = @CFLAGS@ @DEFS@ + LDFLAGS = @LDFLAGS@ +@@ -24,7 +25,7 @@ FILES = src/dnet.o src/dhash.o src/dlist.o src/dstrbuf.o src/dutil.o src/dvector + .PHONY: all clean-all clean distclean install uninstall + + all: $(FILES) +- ar rc libdlib.a $(FILES) ++ $(AR) rc libdlib.a $(FILES) + + test: + $(CC) $(CFLAGS) -o test test.c libdlib.a -lm +--- a/dlib/configure.in ++++ b/dlib/configure.in +@@ -11,6 +11,7 @@ cwd=`pwd` + + # Checks for programs. + AC_PROG_CC ++AC_PROG_AR + AC_PROG_MAKE_SET + + AC_ARG_WITH(ssl, [ --with-ssl force use of TLS/SSL], [use_ssl=$withval], ) diff --git a/net-mail/email/files/email-3.1.3-fix_c23.patch b/net-mail/email/files/email-3.1.3-fix_c23.patch new file mode 100644 index 000000000000..4fcfde64f0eb --- /dev/null +++ b/net-mail/email/files/email-3.1.3-fix_c23.patch @@ -0,0 +1,16 @@ +PR pending https://github.com/deanproxy/dlib/pull/8.patch +see https://bugs.gentoo.org/944203 https://bugs.gentoo.org/969062 +don't use bolean' keywords with C23 +--- a/dlib/include/dlib.h ++++ b/dlib/include/dlib.h +@@ -1,7 +1,9 @@ + #ifndef __DLIB_H + #define __DLIB_H 1 + +-typedef enum { false, true } bool; ++#if __STDC_VERSION__ < 202311L ++ typedef enum { false, true } bool; ++#endif + enum { ERROR, SUCCESS, DLIB_MAXBUF = 1024 }; + + #define DLIB_VERSION "0.1b"
