From cfc29c8eec7c629fe1a4f40d4e7c0bea616ef589 Mon Sep 17 00:00:00 2001
From: James Browning <JamesB.fe80@gmail.com>
Date: Thu, 6 Jun 2024 11:12:35 +0000
Subject: [PATCH] net-misc/ntpsec: Solve conflicting modules problem

gpep517 install-wheel throws a fit if run after
waf-utils_src_install for the same Python.

Bug: https://bugs.gentoo.org/910009
Bug: https://bugs.gentoo.org/922819
Signed-off-by: James Browning <JamesB.fe80@gmail.com>
Signed-off-by: Sam James <sam@gentoo.org>
---
 net-misc/ntpsec/ntpsec-1.2.2a-r1.ebuild | 2 +-
 net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild  | 2 +-
 net-misc/ntpsec/ntpsec-9999.ebuild      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-misc/ntpsec/ntpsec-1.2.2a-r1.ebuild b/net-misc/ntpsec/ntpsec-1.2.2a-r1.ebuild
index c914d33d6e0cd..44d6ac637a264 100644
--- a/net-misc/ntpsec/ntpsec-1.2.2a-r1.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.2.2a-r1.ebuild
@@ -159,13 +159,13 @@ src_install() {
 	# move doc files to /usr/share/doc/"${P}"
 	use doc && mv -v "${ED}"/usr/share/doc/"${PN}" "${ED}"/usr/share/doc/"${P}"/html
 
-	waf-utils_src_install --notests
 	ln -svf pylib build/main/ntp
 	wheel_name=$(
 		cd build/main && \
 		gpep517 build-wheel --output-fd 3 --wheel-dir ../.. 3>&1 >&2
 	)
 	python_foreach_impl python_install
+	waf-utils_src_install --notests
 	python_fix_shebang "${ED}"
 	python_optimize
 }
diff --git a/net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild b/net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild
index c1ad553122aeb..367b9c6b8fe32 100644
--- a/net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild
@@ -155,13 +155,13 @@ src_install() {
 	# move doc files to /usr/share/doc/"${P}"
 	use doc && mv -v "${ED}"/usr/share/doc/"${PN}" "${ED}"/usr/share/doc/"${P}"/html
 
-	waf-utils_src_install --notests
 	ln -svf pylib build/main/ntp
 	wheel_name=$(
 		cd build/main && \
 		gpep517 build-wheel --output-fd 3 --wheel-dir ../.. 3>&1 >&2
 	)
 	python_foreach_impl python_install
+	waf-utils_src_install --notests
 	python_fix_shebang "${ED}"
 	python_optimize
 }
diff --git a/net-misc/ntpsec/ntpsec-9999.ebuild b/net-misc/ntpsec/ntpsec-9999.ebuild
index c656c7343aab9..2bc971ead230b 100644
--- a/net-misc/ntpsec/ntpsec-9999.ebuild
+++ b/net-misc/ntpsec/ntpsec-9999.ebuild
@@ -155,13 +155,13 @@ src_install() {
 	# move doc files to /usr/share/doc/"${P}"
 	use doc && mv -v "${ED}"/usr/share/doc/"${PN}" "${ED}"/usr/share/doc/"${P}"/html
 
-	waf-utils_src_install --notests
 	ln -svf pylib build/main/ntp
 	wheel_name=$(
 		cd build/main && \
 		gpep517 build-wheel --output-fd 3 --wheel-dir ../.. 3>&1 >&2
 	)
 	python_foreach_impl python_install
+	waf-utils_src_install --notests
 	python_fix_shebang "${ED}"
 	python_optimize
 }