gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-11-09 18:47:16 -08:00
Code Issues Projects Releases Wiki Activity

net-misc/ntpsec: Solve conflicting modules problem

Browse Source 
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>
This commit is contained in:
James Browning
2024-06-14 09:01:54 +01:00
committed by Sam James
parent bfb6ca177d
commit cfc29c8eec
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net-misc/ntpsec/ntpsec-1.2.2a-r1.ebuild
+1 -1
View File
@@ -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
}
net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild
+1 -1
View File
@@ -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
}
net-misc/ntpsec/ntpsec-9999.ebuild
+1 -1
View File
@@ -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
}