commit: cfc29c8eec7c629fe1a4f40d4e7c0bea616ef589 Author: James Browning <JamesB.fe80 <AT> gmail <DOT> com> AuthorDate: Thu Jun 6 11:12:35 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Jun 14 08:01:54 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfc29c8e
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 <AT> gmail.com> Signed-off-by: Sam James <sam <AT> 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 c914d33d6e0c..44d6ac637a26 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 c1ad553122ae..367b9c6b8fe3 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 c656c7343aab..2bc971ead230 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 }
