commit: d7d9ffd7751437e145b5b867efa14f39c9393fc7
Author: James Browning <JamesB.fe80 <AT> gmail <DOT> com>
AuthorDate: Tue Jun 4 19:01:28 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 14 08:01:48 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7d9ffd7
net-misc/ntpsec: Replace n(+1) used whole tree builds with 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 | 17 +++++++++++++----
net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild | 19 ++++++++++++++-----
net-misc/ntpsec/ntpsec-9999.ebuild | 19 ++++++++++++++-----
3 files changed, 41 insertions(+), 14 deletions(-)
diff --git a/net-misc/ntpsec/ntpsec-1.2.2a-r1.ebuild
b/net-misc/ntpsec/ntpsec-1.2.2a-r1.ebuild
index 9db716210dab..7ac251bca9f3 100644
--- a/net-misc/ntpsec/ntpsec-1.2.2a-r1.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.2.2a-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-DISTUTILS_EXT=1
+#DISTUTILS_USE_PEP517="flit"
PYTHON_COMPAT=( python3_{10..11} )
PYTHON_REQ_USE='threads(+)'
DISTUTILS_USE_SETUPTOOLS=no
@@ -108,7 +108,6 @@ src_configure() {
--notests
--nopyc
--nopyo
- --enable-pylib ext
--refclock="${CLOCKSTRING}"
#--build-epoch="$(date +%s)"
$(use doc || echo "--disable-doc")
@@ -165,14 +164,24 @@ 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
-}
-python_install() {
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
python_fix_shebang "${ED}"
python_optimize
}
+python_install() {
+ ${PYTHON} -m gpep517 \
+ install-wheel "${wheel_name}" \
+ --optimize all --destdir "${D}"
+}
+
pkg_postinst() {
einfo "If you want to serve time on your local network, then"
einfo "you should disable all the ref_clocks unless you have"
diff --git a/net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild
b/net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild
index 760ab7ded80c..f68a9031ad40 100644
--- a/net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild
@@ -3,8 +3,8 @@
EAPI=8
-DISTUTILS_EXT=1
-PYTHON_COMPAT=( python3_{10..12} )
+#DISTUTILS_USE_PEP517="flit"
+PYTHON_COMPAT=( python3_{10..13} )
PYTHON_REQ_USE='threads(+)'
DISTUTILS_USE_SETUPTOOLS=no
@@ -108,7 +108,6 @@ src_configure() {
--notests
--nopyc
--nopyo
- --enable-pylib ext
--refclock="${CLOCKSTRING}"
#--build-epoch="$(date +%s)"
$(use doc || echo "--disable-doc")
@@ -164,14 +163,24 @@ 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
-}
-python_install() {
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
python_fix_shebang "${ED}"
python_optimize
}
+python_install() {
+ ${PYTHON} -m gpep517 \
+ install-wheel "${wheel_name}" \
+ --optimize all --destdir "${D}"
+}
+
pkg_postinst() {
einfo "If you want to serve time on your local network, then"
einfo "you should disable all the ref_clocks unless you have"
diff --git a/net-misc/ntpsec/ntpsec-9999.ebuild
b/net-misc/ntpsec/ntpsec-9999.ebuild
index 79ca14fe71f2..01362d1ff984 100644
--- a/net-misc/ntpsec/ntpsec-9999.ebuild
+++ b/net-misc/ntpsec/ntpsec-9999.ebuild
@@ -3,8 +3,8 @@
EAPI=8
-DISTUTILS_EXT=1
-PYTHON_COMPAT=( python3_{10..12} )
+#DISTUTILS_USE_PEP517="flit"
+PYTHON_COMPAT=( python3_{10..13} )
PYTHON_REQ_USE='threads(+)'
DISTUTILS_USE_SETUPTOOLS=no
@@ -108,7 +108,6 @@ src_configure() {
--notests
--nopyc
--nopyo
- --enable-pylib ext
--refclock="${CLOCKSTRING}"
#--build-epoch="$(date +%s)"
$(use doc || echo "--disable-doc")
@@ -164,14 +163,24 @@ 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
-}
-python_install() {
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
python_fix_shebang "${ED}"
python_optimize
}
+python_install() {
+ ${PYTHON} -m gpep517 \
+ install-wheel "${wheel_name}" \
+ --optimize all --destdir "${D}"
+}
+
pkg_postinst() {
einfo "If you want to serve time on your local network, then"
einfo "you should disable all the ref_clocks unless you have"
