From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 975731582ED for ; Fri, 14 Jun 2024 08:03:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C9502E2BB4; Fri, 14 Jun 2024 08:03:30 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AC48EE2BB4 for ; Fri, 14 Jun 2024 08:03:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EA5D633C1C1 for ; Fri, 14 Jun 2024 08:03:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4650D1CEF for ; Fri, 14 Jun 2024 08:03:27 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1718352144.6bca5783e91c687ea600bfaab02879ca9cd3b4d9.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/ntpsec/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/ntpsec/metadata.xml net-misc/ntpsec/ntpsec-1.2.2a-r1.ebuild net-misc/ntpsec/ntpsec-1.2.2a.ebuild net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild net-misc/ntpsec/ntpsec-1.2.3.ebuild X-VCS-Directories: net-misc/ntpsec/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 6bca5783e91c687ea600bfaab02879ca9cd3b4d9 X-VCS-Branch: master Date: Fri, 14 Jun 2024 08:03:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: fc1284b0-4fb0-4379-961f-7f86268d0b5a X-Archives-Hash: cb8c3bf63cf099f8bf4e294c657d8bf0 commit: 6bca5783e91c687ea600bfaab02879ca9cd3b4d9 Author: Sam James gentoo org> AuthorDate: Fri Jun 14 07:39:03 2024 +0000 Commit: Sam James gentoo 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 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 @@ Use libbsd instead of internal funcs Set local clock deps Make visualizations of offsets, jiffies, etc. + Oncore driver + Trimble driver + Trutime driver (deprecated) + Enable gpsd daemon support + JJY driver + Enable support for generic time radios and GPSDOs + Spectracom driver + Obtain refclock info from shared memory-segment + PPS cesium clock driver + Hewlett Packard GPS driver + Zyfer driver + Arbiter 1088A/B GPS driver + NMEA GPS driver + NIST/USNO/PTB Modem Time Services + Support for undisciplined local clock (not recommended) Oncore driver Trimble driver Trutime driver (deprecated) 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"