[gentoo-commits] repo/gentoo:master commit in: net-misc/ntpsec/

[Sam James]

commit:     fa8cb51ea78399f327fe01c6076081eba73c17ad
Author:     James Browning <JamesB.fe80 <AT> gmail <DOT> com>
AuthorDate: Tue Jun  4 19:12:27 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 14 08:01:49 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa8cb51e

net-misc/ntpsec: Reduce the number of actual builds to 1 from n(+1)

Signed-off-by: James Browning <JamesB.fe80 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-misc/ntpsec/ntpsec-1.2.2a-r1.ebuild | 14 +++-----------
 net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild  | 14 +++-----------
 net-misc/ntpsec/ntpsec-9999.ebuild      | 14 +++-----------
 3 files changed, 9 insertions(+), 33 deletions(-)

diff --git a/net-misc/ntpsec/ntpsec-1.2.2a-r1.ebuild 
b/net-misc/ntpsec/ntpsec-1.2.2a-r1.ebuild
index 7ac251bca9f3..0a94ff49d14d 100644
--- a/net-misc/ntpsec/ntpsec-1.2.2a-r1.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.2.2a-r1.ebuild
@@ -86,8 +86,6 @@ src_prepare() {
        fi
        # remove extra default pool servers
        sed -i '/use-pool/s/^/#/' "${S}"/etc/ntp.d/default.conf || die
-
-       python_copy_sources
 }
 
 src_configure() {
@@ -118,26 +116,20 @@ src_configure() {
                $(use smear     && echo "--enable-leap-smear")
                $(use debug     && echo "--enable-debug")
        )
-
-       distutils-r1_src_configure
-}
-
-python_configure() {
+       python_setup
        cp -v "${FILESDIR}/flit.toml" "pylib/pyproject.toml"
        waf-utils_src_configure "${myconf[@]}"
 }
 
-python_compile() {
+src_compile() {
        waf-utils_src_compile --notests
 }
 
-python_test() {
+src_test() {
        waf-utils_src_compile check
 }
 
 src_install() {
-       distutils-r1_src_install
-
        # Install heat generating scripts
        use heat && dosbin "${S}"/contrib/ntpheat{,usb}
 

diff --git a/net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild 
b/net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild
index f68a9031ad40..cd24946409e0 100644
--- a/net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild
@@ -86,8 +86,6 @@ src_prepare() {
        fi
        # remove extra default pool servers
        sed -i '/use-pool/s/^/#/' "${S}"/etc/ntp.d/default.conf || die
-
-       python_copy_sources
 }
 
 src_configure() {
@@ -117,26 +115,20 @@ src_configure() {
                $(use smear     && echo "--enable-leap-smear")
                $(use debug     && echo "--enable-debug")
        )
-
-       distutils-r1_src_configure
-}
-
-python_configure() {
+       python_setup
        cp -v "${FILESDIR}/flit.toml" "pylib/pyproject.toml"
        waf-utils_src_configure "${myconf[@]}"
 }
 
-python_compile() {
+src_compile() {
        waf-utils_src_compile --notests
 }
 
-python_test() {
+src_test() {
        waf-utils_src_compile check
 }
 
 src_install() {
-       distutils-r1_src_install
-
        # Install heat generating scripts
        use heat && dosbin "${S}"/contrib/ntpheat{,usb}
 

diff --git a/net-misc/ntpsec/ntpsec-9999.ebuild 
b/net-misc/ntpsec/ntpsec-9999.ebuild
index 01362d1ff984..20b970da4170 100644
--- a/net-misc/ntpsec/ntpsec-9999.ebuild
+++ b/net-misc/ntpsec/ntpsec-9999.ebuild
@@ -86,8 +86,6 @@ src_prepare() {
        fi
        # remove extra default pool servers
        sed -i '/use-pool/s/^/#/' "${S}"/etc/ntp.d/default.conf || die
-
-       python_copy_sources
 }
 
 src_configure() {
@@ -117,26 +115,20 @@ src_configure() {
                $(use smear     && echo "--enable-leap-smear")
                $(use debug     && echo "--enable-debug")
        )
-
-       distutils-r1_src_configure
-}
-
-python_configure() {
+       python_setup
        cp -v "${FILESDIR}/flit.toml" "pylib/pyproject.toml"
        waf-utils_src_configure "${myconf[@]}"
 }
 
-python_compile() {
+src_compile() {
        waf-utils_src_compile --notests
 }
 
-python_test() {
+src_test() {
        waf-utils_src_compile check
 }
 
 src_install() {
-       distutils-r1_src_install
-
        # Install heat generating scripts
        use heat && dosbin "${S}"/contrib/ntpheat{,usb}