commit: 6e50e49584b7d057dab9850853938e15e7e878b4 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Sun Mar 1 22:18:45 2026 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sun Mar 1 22:18:45 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e50e495
net-misc/ntpsec: call distutils-r1_src_prepare This ensures that python_export_utf8_locale will be called, which should prevent build failures with non-UTF-8 locales. Closes: https://bugs.gentoo.org/970677 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> net-misc/ntpsec/ntpsec-1.2.4.ebuild | 24 ++++++++++++------------ net-misc/ntpsec/ntpsec-9999.ebuild | 24 ++++++++++++------------ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/net-misc/ntpsec/ntpsec-1.2.4.ebuild b/net-misc/ntpsec/ntpsec-1.2.4.ebuild index da1812db19d3..d2973272f2ac 100644 --- a/net-misc/ntpsec/ntpsec-1.2.4.ebuild +++ b/net-misc/ntpsec/ntpsec-1.2.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2025 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -69,13 +69,6 @@ BDEPEND+=" app-alternatives/yacc " -PATCHES=( - "${FILESDIR}/${PN}-1.1.9-remove-asciidoctor-from-config.patch" - "${FILESDIR}/${PN}-1.2.2-logrotate.patch" - "${FILESDIR}/${PN}-1.2.4-pep517-no-egg.patch" - "${FILESDIR}/${PN}-1.2.4-s390x-tests.patch" -) - WAF_BINARY="${S}/waf" src_unpack() { @@ -90,13 +83,20 @@ src_unpack() { } src_prepare() { - default + local PATCHES=( + "${FILESDIR}/${PN}-1.1.9-remove-asciidoctor-from-config.patch" + "${FILESDIR}/${PN}-1.2.2-logrotate.patch" + "${FILESDIR}/${PN}-1.2.4-pep517-no-egg.patch" + "${FILESDIR}/${PN}-1.2.4-s390x-tests.patch" + ) + if ! use libbsd ; then + PATCHES+=( "${FILESDIR}/${PN}-no-bsd.patch" ) + fi + + distutils-r1_src_prepare # Remove autostripping of binaries sed -i -e '/Strip binaries/d' wscript || die - if ! use libbsd ; then - eapply "${FILESDIR}/${PN}-no-bsd.patch" - fi # remove extra default pool servers sed -i '/use-pool/s/^/#/' "${S}"/etc/ntp.d/default.conf || die } diff --git a/net-misc/ntpsec/ntpsec-9999.ebuild b/net-misc/ntpsec/ntpsec-9999.ebuild index ebb65ee7d04a..2a5680fe52d4 100644 --- a/net-misc/ntpsec/ntpsec-9999.ebuild +++ b/net-misc/ntpsec/ntpsec-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2025 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -69,13 +69,6 @@ BDEPEND+=" app-alternatives/yacc " -PATCHES=( - "${FILESDIR}/${PN}-1.1.9-remove-asciidoctor-from-config.patch" - "${FILESDIR}/${PN}-1.2.2-logrotate.patch" - "${FILESDIR}/${PN}-1.2.4-pep517-no-egg.patch" - "${FILESDIR}/${PN}-1.2.4-s390x-tests.patch" -) - WAF_BINARY="${S}/waf" src_unpack() { @@ -90,13 +83,20 @@ src_unpack() { } src_prepare() { - default + local PATCHES=( + "${FILESDIR}/${PN}-1.1.9-remove-asciidoctor-from-config.patch" + "${FILESDIR}/${PN}-1.2.2-logrotate.patch" + "${FILESDIR}/${PN}-1.2.4-pep517-no-egg.patch" + "${FILESDIR}/${PN}-1.2.4-s390x-tests.patch" + ) + if ! use libbsd ; then + PATCHES+=( "${FILESDIR}/${PN}-no-bsd.patch" ) + fi + + distutils-r1_src_prepare # Remove autostripping of binaries sed -i -e '/Strip binaries/d' wscript || die - if ! use libbsd ; then - eapply "${FILESDIR}/${PN}-no-bsd.patch" - fi # remove extra default pool servers sed -i '/use-pool/s/^/#/' "${S}"/etc/ntp.d/default.conf || die }
