commit: 2b8f3716f7a05d3c5ac69abbc9483c7cba996272 Author: Cristian Othón Martínez Vera <cfuga <AT> cfuga <DOT> mx> AuthorDate: Sun Aug 17 02:33:00 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Sep 6 15:26:26 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b8f3716
mail-mta/sendmail: fix UseFlagsWithoutDeps, always enable ipv6 and sockets Also, sorted USE flags and ebuild code Signed-off-by: Cristian Othón Martínez Vera <cfuga <AT> cfuga.mx> Part-of: https://github.com/gentoo/gentoo/pull/43481 Signed-off-by: Sam James <sam <AT> gentoo.org> mail-mta/sendmail/sendmail-8.18.1-r1.ebuild | 14 +++++++------- mail-mta/sendmail/sendmail-8.18.1.10-r1.ebuild | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/mail-mta/sendmail/sendmail-8.18.1-r1.ebuild b/mail-mta/sendmail/sendmail-8.18.1-r1.ebuild index a51f73553d9e..d3429335eb90 100644 --- a/mail-mta/sendmail/sendmail-8.18.1-r1.ebuild +++ b/mail-mta/sendmail/sendmail-8.18.1-r1.ebuild @@ -19,7 +19,7 @@ SRC_URI+=" https://ftp.sendmail.org/past-releases/${PN}.${PV}.tar.gz"; LICENSE="Sendmail GPL-2" # GPL-2 is here for initscript SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="+berkdb eai fips ipv6 ldap mbox nis sasl selinux sockets ssl tinycdb tcpd" +IUSE="+berkdb eai fips ldap mbox nis sasl selinux ssl tcpd tinycdb" REQUIRED_USE=" || ( berkdb tinycdb ) fips? ( ssl ) @@ -86,6 +86,9 @@ src_prepare() { local confMAPDEF="-DMAP_REGEX" local conf_sendmail_LIBS= + # Always enable ipv6 and sockets + confENVDEF+=" -DNETINET6 -DSOCKETMAP" + if use berkdb; then # See bug #808954 for FLOCK confENVDEF+=" -DHASFLOCK=1" @@ -106,6 +109,8 @@ src_prepare() { confLIBS+=" -lldap -llber" fi + use nis && confENVDEF+=" -DNIS" + if use sasl; then confCCOPTS+=" $($(tc-getPKG_CONFIG) --cflags libsasl2)" confENVDEF+=" -DSASL=2" @@ -140,13 +145,8 @@ src_prepare() { confMAPDEF+=" -UCDB" fi - use ipv6 && confENVDEF+=" -DNETINET6" - use nis && confENVDEF+=" -DNIS" - use sockets && confENVDEF+=" -DSOCKETMAP" - if use elibc_musl; then - confENVDEF+=" -DHASSTRERROR -DHASRRESVPORT=0" - use ipv6 && confENVDEF+=" -DNEEDSGETIPNODE" + confENVDEF+=" -DHASSTRERROR -DHASRRESVPORT=0 -DNEEDSGETIPNODE" eapply "${FILESDIR}"/${PN}-musl-stack-size.patch eapply "${FILESDIR}"/${PN}-musl-disable-cdefs.patch diff --git a/mail-mta/sendmail/sendmail-8.18.1.10-r1.ebuild b/mail-mta/sendmail/sendmail-8.18.1.10-r1.ebuild index a69cd5c49bab..3850efb0a4c6 100644 --- a/mail-mta/sendmail/sendmail-8.18.1.10-r1.ebuild +++ b/mail-mta/sendmail/sendmail-8.18.1.10-r1.ebuild @@ -19,7 +19,7 @@ SRC_URI+=" https://ftp.sendmail.org/past-releases/${PN}.${PV}.tar.gz"; LICENSE="Sendmail GPL-2" # GPL-2 is here for initscript SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="+berkdb eai fips ipv6 ldap mbox nis sasl selinux sockets ssl tinycdb tcpd" +IUSE="+berkdb eai fips ldap mbox nis sasl selinux ssl tcpd tinycdb" REQUIRED_USE=" || ( berkdb tinycdb ) fips? ( ssl ) @@ -85,6 +85,9 @@ src_prepare() { local confMAPDEF="-DMAP_REGEX" local conf_sendmail_LIBS= + # Always enable ipv6 and sockets + confENVDEF+=" -DNETINET6 -DSOCKETMAP" + if use berkdb; then # See bug #808954 for FLOCK confENVDEF+=" -DHASFLOCK=1" @@ -105,6 +108,8 @@ src_prepare() { confLIBS+=" -lldap -llber" fi + use nis && confENVDEF+=" -DNIS" + if use sasl; then confCCOPTS+=" $($(tc-getPKG_CONFIG) --cflags libsasl2)" confENVDEF+=" -DSASL=2" @@ -139,13 +144,8 @@ src_prepare() { confMAPDEF+=" -UCDB" fi - use ipv6 && confENVDEF+=" -DNETINET6" - use nis && confENVDEF+=" -DNIS" - use sockets && confENVDEF+=" -DSOCKETMAP" - if use elibc_musl; then - confENVDEF+=" -DHASSTRERROR -DHASRRESVPORT=0" - use ipv6 && confENVDEF+=" -DNEEDSGETIPNODE" + confENVDEF+=" -DHASSTRERROR -DHASRRESVPORT=0 -DNEEDSGETIPNODE" eapply "${FILESDIR}"/${PN}-musl-stack-size.patch eapply "${FILESDIR}"/${PN}-musl-disable-cdefs.patch
