commit: 6bca5783e91c687ea600bfaab02879ca9cd3b4d9
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 14 07:39:03 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 14 08:02:24 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bca5783
net-misc/ntpsec: move changes into ~arch revbumps
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/ntpsec/metadata.xml | 15 ++++++
net-misc/ntpsec/ntpsec-1.2.2a-r1.ebuild | 2 +-
...ntpsec-1.2.3-r1.ebuild => ntpsec-1.2.2a.ebuild} | 54 ++++++++++------------
net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild | 2 +-
...{ntpsec-1.2.3-r1.ebuild => ntpsec-1.2.3.ebuild} | 53 ++++++++++-----------
5 files changed, 66 insertions(+), 60 deletions(-)
diff --git a/net-misc/ntpsec/metadata.xml b/net-misc/ntpsec/metadata.xml
index c7648d479a4a..a2ce6c3f8cbc 100644
--- a/net-misc/ntpsec/metadata.xml
+++ b/net-misc/ntpsec/metadata.xml
@@ -12,6 +12,21 @@
<flag name="libbsd">Use libbsd instead of internal funcs</flag>
<flag name="nist">Set local clock deps</flag>
<flag name="ntpviz">Make visualizations of offsets, jiffies,
etc.</flag>
+ <flag name="rclock_oncore">Oncore driver</flag>
+ <flag name="rclock_trimble">Trimble driver</flag>
+ <flag name="rclock_truetime">Trutime driver (deprecated)</flag>
+ <flag name="rclock_gpsd">Enable gpsd daemon support</flag>
+ <flag name="rclock_jjy">JJY driver</flag>
+ <flag name="rclock_generic">Enable support for generic time
radios and GPSDOs</flag>
+ <flag name="rclock_spectracom">Spectracom driver</flag>
+ <flag name="rclock_shm">Obtain refclock info from shared
memory-segment</flag>
+ <flag name="rclock_pps">PPS cesium clock driver</flag>
+ <flag name="rclock_hpgps">Hewlett Packard GPS driver</flag>
+ <flag name="rclock_zyfer">Zyfer driver</flag>
+ <flag name="rclock_arbiter">Arbiter 1088A/B GPS driver</flag>
+ <flag name="rclock_nmea">NMEA GPS driver</flag>
+ <flag name="rclock_modem">NIST/USNO/PTB Modem Time
Services</flag>
+ <flag name="rclock_local">Support for undisciplined local clock
(not recommended)</flag>
<flag name="oncore">Oncore driver</flag>
<flag name="trimble">Trimble driver</flag>
<flag name="truetime">Trutime driver (deprecated)</flag>
diff --git a/net-misc/ntpsec/ntpsec-1.2.2a-r1.ebuild
b/net-misc/ntpsec/ntpsec-1.2.2a-r1.ebuild
index 58c5b907d54f..a90b1716e8c6 100644
--- a/net-misc/ntpsec/ntpsec-1.2.2a-r1.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.2.2a-r1.ebuild
@@ -20,7 +20,7 @@ else
verify-sig? (
https://ftp.ntpsec.org/pub/releases/${P}.tar.gz.asc )
https://waf.io/waf-2.0.27
"
- KEYWORDS="amd64 arm arm64 ~riscv ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-ntpsec )"
fi
diff --git a/net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild
b/net-misc/ntpsec/ntpsec-1.2.2a.ebuild
similarity index 82%
copy from net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild
copy to net-misc/ntpsec/ntpsec-1.2.2a.ebuild
index b32037a2e83d..52c1058a3b2e 100644
--- a/net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.2.2a.ebuild
@@ -3,9 +3,10 @@
EAPI=8
-DISTUTILS_USE_PEP517="flit"
-PYTHON_COMPAT=( python3_{10..13} )
+DISTUTILS_EXT=1
+PYTHON_COMPAT=( python3_{10..11} )
PYTHON_REQ_USE='threads(+)'
+DISTUTILS_USE_SETUPTOOLS=no
inherit distutils-r1 flag-o-matic waf-utils systemd
@@ -35,9 +36,10 @@ NTPSEC_REFCLOCK=(
shm pps hpgps zyfer arbiter nmea modem local
)
-IUSE="${NTPSEC_REFCLOCK[@]} debug doc early heat libbsd nist ntpviz samba
seccomp smear test" #ionice
-REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( local )"
-RESTRICT="!test? ( test )"
+IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
+
+IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd nist ntpviz
samba seccomp smear" #ionice
+REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )"
# net-misc/pps-tools oncore,pps
DEPEND="
@@ -47,8 +49,8 @@ DEPEND="
sys-libs/libcap
libbsd? ( dev-libs/libbsd:0= )
seccomp? ( sys-libs/libseccomp )
- oncore? ( net-misc/pps-tools )
- pps? ( net-misc/pps-tools )
+ rclock_oncore? ( net-misc/pps-tools )
+ rclock_pps? ( net-misc/pps-tools )
"
RDEPEND="
${DEPEND}
@@ -71,7 +73,6 @@ BDEPEND+="
PATCHES=(
"${FILESDIR}/${PN}-1.1.9-remove-asciidoctor-from-config.patch"
"${FILESDIR}/${PN}-1.2.2-logrotate.patch"
- "${FILESDIR}/${PN}-1.2.3-pep517-no-egg.patch"
)
WAF_BINARY="${S}/waf"
@@ -86,6 +87,8 @@ 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() {
@@ -96,7 +99,7 @@ src_configure() {
local CLOCKSTRING=""
for refclock in ${NTPSEC_REFCLOCK[@]} ; do
- if use ${refclock} ; then
+ if use rclock_${refclock} ; then
string_127+="$refclock,"
fi
done
@@ -106,33 +109,36 @@ src_configure() {
--notests
--nopyc
--nopyo
+ --enable-pylib ext
--refclock="${CLOCKSTRING}"
#--build-epoch="$(date +%s)"
$(use doc || echo "--disable-doc")
$(use early && echo "--enable-early-droproot")
+ $(use gdb && echo "--enable-debug-gdb")
$(use samba && echo "--enable-mssntp")
$(use seccomp && echo "--enable-seccomp")
$(use smear && echo "--enable-leap-smear")
$(use debug && echo "--enable-debug")
)
- python_setup
- cp -v "${FILESDIR}/flit.toml" "pylib/pyproject.toml"
- waf-utils_src_configure "${myconf[@]}"
+
+ distutils-r1_src_configure
}
-src_compile() {
- waf-utils_src_compile --notests
+python_configure() {
+ waf-utils_src_configure "${myconf[@]}"
}
-src_test() {
- python_test
+python_compile() {
+ waf-utils_src_compile --notests
}
python_test() {
- "${EPYTHON}" "${WAF_BINARY}" check -v -j $(makeopts_jobs)
+ waf-utils_src_compile check
}
src_install() {
+ distutils-r1_src_install
+
# Install heat generating scripts
use heat && dosbin "${S}"/contrib/ntpheat{,usb}
@@ -159,24 +165,14 @@ 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
+}
- 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_install() {
waf-utils_src_install --notests
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 b32037a2e83d..683fced0c1d1 100644
--- a/net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild
@@ -19,7 +19,7 @@ else
https://ftp.ntpsec.org/pub/releases/${P}.tar.gz
verify-sig? (
https://ftp.ntpsec.org/pub/releases/${P}.tar.gz.asc )
"
- KEYWORDS="amd64 arm arm64 ~riscv ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-ntpsec )"
fi
diff --git a/net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild
b/net-misc/ntpsec/ntpsec-1.2.3.ebuild
similarity index 82%
copy from net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild
copy to net-misc/ntpsec/ntpsec-1.2.3.ebuild
index b32037a2e83d..29d8829e72d7 100644
--- a/net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.2.3.ebuild
@@ -3,9 +3,10 @@
EAPI=8
-DISTUTILS_USE_PEP517="flit"
-PYTHON_COMPAT=( python3_{10..13} )
+DISTUTILS_EXT=1
+PYTHON_COMPAT=( python3_{10..12} )
PYTHON_REQ_USE='threads(+)'
+DISTUTILS_USE_SETUPTOOLS=no
inherit distutils-r1 flag-o-matic waf-utils systemd
@@ -35,9 +36,10 @@ NTPSEC_REFCLOCK=(
shm pps hpgps zyfer arbiter nmea modem local
)
-IUSE="${NTPSEC_REFCLOCK[@]} debug doc early heat libbsd nist ntpviz samba
seccomp smear test" #ionice
-REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( local )"
-RESTRICT="!test? ( test )"
+IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
+
+IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early heat libbsd nist ntpviz samba
seccomp smear" #ionice
+REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )"
# net-misc/pps-tools oncore,pps
DEPEND="
@@ -47,8 +49,8 @@ DEPEND="
sys-libs/libcap
libbsd? ( dev-libs/libbsd:0= )
seccomp? ( sys-libs/libseccomp )
- oncore? ( net-misc/pps-tools )
- pps? ( net-misc/pps-tools )
+ rclock_oncore? ( net-misc/pps-tools )
+ rclock_pps? ( net-misc/pps-tools )
"
RDEPEND="
${DEPEND}
@@ -71,7 +73,6 @@ BDEPEND+="
PATCHES=(
"${FILESDIR}/${PN}-1.1.9-remove-asciidoctor-from-config.patch"
"${FILESDIR}/${PN}-1.2.2-logrotate.patch"
- "${FILESDIR}/${PN}-1.2.3-pep517-no-egg.patch"
)
WAF_BINARY="${S}/waf"
@@ -86,6 +87,8 @@ 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() {
@@ -96,7 +99,7 @@ src_configure() {
local CLOCKSTRING=""
for refclock in ${NTPSEC_REFCLOCK[@]} ; do
- if use ${refclock} ; then
+ if use rclock_${refclock} ; then
string_127+="$refclock,"
fi
done
@@ -106,6 +109,7 @@ src_configure() {
--notests
--nopyc
--nopyo
+ --enable-pylib ext
--refclock="${CLOCKSTRING}"
#--build-epoch="$(date +%s)"
$(use doc || echo "--disable-doc")
@@ -115,24 +119,25 @@ src_configure() {
$(use smear && echo "--enable-leap-smear")
$(use debug && echo "--enable-debug")
)
- python_setup
- cp -v "${FILESDIR}/flit.toml" "pylib/pyproject.toml"
- waf-utils_src_configure "${myconf[@]}"
+
+ distutils-r1_src_configure
}
-src_compile() {
- waf-utils_src_compile --notests
+python_configure() {
+ waf-utils_src_configure "${myconf[@]}"
}
-src_test() {
- python_test
+python_compile() {
+ waf-utils_src_compile --notests
}
python_test() {
- "${EPYTHON}" "${WAF_BINARY}" check -v -j $(makeopts_jobs)
+ waf-utils_src_compile check
}
src_install() {
+ distutils-r1_src_install
+
# Install heat generating scripts
use heat && dosbin "${S}"/contrib/ntpheat{,usb}
@@ -159,24 +164,14 @@ 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
+}
- 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_install() {
waf-utils_src_install --notests
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"
