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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 93909158086 for ; Mon, 6 Dec 2021 01:41:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A7326E07A5; Mon, 6 Dec 2021 01:41:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 757C3E07A5 for ; Mon, 6 Dec 2021 01:41:28 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4921B342B64 for ; Mon, 6 Dec 2021 01:41:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 99D9C1A0 for ; Mon, 6 Dec 2021 01:41:25 +0000 (UTC) From: "Steve Arnold" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Steve Arnold" Message-ID: <1638754862.3237d7b791bd52013ef59465ce39f9e7bf396565.nerdboy@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.1-r1.ebuild net-misc/ntpsec/ntpsec-9999.ebuild X-VCS-Directories: net-misc/ntpsec/ X-VCS-Committer: nerdboy X-VCS-Committer-Name: Steve Arnold X-VCS-Revision: 3237d7b791bd52013ef59465ce39f9e7bf396565 X-VCS-Branch: master Date: Mon, 6 Dec 2021 01:41:25 +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: e1ded7b8-543b-4e5b-95ce-6744f893f9e0 X-Archives-Hash: cd23582470783105df7458b7d5f3552a commit: 3237d7b791bd52013ef59465ce39f9e7bf396565 Author: Steve Arnold gentoo org> AuthorDate: Mon Dec 6 01:29:08 2021 +0000 Commit: Steve Arnold gentoo org> CommitDate: Mon Dec 6 01:41:02 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3237d7b7 net-misc/ntpsec: remove crufty/unsupported clock * neoclock is no longer in the list of supported clocks Closes: https://bugs.gentoo.org/828039 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Steve Arnold gentoo.org> net-misc/ntpsec/metadata.xml | 1 - net-misc/ntpsec/ntpsec-1.2.1-r1.ebuild | 4 ++-- net-misc/ntpsec/ntpsec-9999.ebuild | 27 +++++++++++++++++++-------- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/net-misc/ntpsec/metadata.xml b/net-misc/ntpsec/metadata.xml index 9d4b63729b27..69f78f92c02d 100644 --- a/net-misc/ntpsec/metadata.xml +++ b/net-misc/ntpsec/metadata.xml @@ -28,7 +28,6 @@ NTPsec project - a secure, hardened, and improved implementation of Network Time Zyfer driver Arbiter 1088A/B GPS driver NMEA GPS driver - NeoClock4X DCF77/TDF driver NIST/USNO/PTB Modem Time Services Support for undisciplined local clock (not recommended) Specify the interval over which a leap second is applied (experimental) diff --git a/net-misc/ntpsec/ntpsec-1.2.1-r1.ebuild b/net-misc/ntpsec/ntpsec-1.2.1-r1.ebuild index 8835c7ccfcfb..379a375aacd1 100644 --- a/net-misc/ntpsec/ntpsec-1.2.1-r1.ebuild +++ b/net-misc/ntpsec/ntpsec-1.2.1-r1.ebuild @@ -23,8 +23,8 @@ HOMEPAGE="https://www.ntpsec.org/" NTPSEC_REFCLOCK=( oncore trimble truetime gpsd jjy generic spectracom - shm pps hpgps zyfer arbiter nmea neoclock modem - local) + shm pps hpgps zyfer arbiter nmea modem local + ) IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_} diff --git a/net-misc/ntpsec/ntpsec-9999.ebuild b/net-misc/ntpsec/ntpsec-9999.ebuild index 4d520e72c5a9..2065ee52d6a6 100644 --- a/net-misc/ntpsec/ntpsec-9999.ebuild +++ b/net-misc/ntpsec/ntpsec-9999.ebuild @@ -3,10 +3,11 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{7..9} ) PYTHON_REQ_USE='threads(+)' +DISTUTILS_USE_SETUPTOOLS=no -inherit flag-o-matic python-r1 waf-utils systemd +inherit distutils-r1 flag-o-matic waf-utils systemd if [[ ${PV} == *9999* ]]; then inherit git-r3 @@ -14,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then else SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${PN}-${PV}.tar.gz" RESTRICT="mirror" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + KEYWORDS="amd64 arm arm64 ~riscv ~x86" fi DESCRIPTION="The NTP reference implementation, refactored" @@ -22,8 +23,8 @@ HOMEPAGE="https://www.ntpsec.org/" NTPSEC_REFCLOCK=( oncore trimble truetime gpsd jjy generic spectracom - shm pps hpgps zyfer arbiter nmea neoclock modem - local) + shm pps hpgps zyfer arbiter nmea modem local + ) IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_} @@ -48,7 +49,7 @@ RDEPEND="${CDEPEND} acct-user/ntp " DEPEND="${CDEPEND} - app-text/asciidoc + >=app-text/asciidoc-8.6.8 dev-libs/libxslt app-text/docbook-xsl-stylesheets sys-devel/bison @@ -56,15 +57,23 @@ DEPEND="${CDEPEND} rclock_pps? ( net-misc/pps-tools ) " +PATCHES=( + "${FILESDIR}/${PN}-1.1.9-remove-asciidoctor-from-config.patch" +) + WAF_BINARY="${S}/waf" src_prepare() { default + # Remove autostripping of binaries sed -i -e '/Strip binaries/d' wscript || die if ! use libbsd ; then eapply "${FILESDIR}/${PN}-no-bsd.patch" fi + # remove extra default pool servers + sed -i '/use-pool/s/^/#/' "${S}"/etc/ntp.d/default.conf || die + python_copy_sources } @@ -85,9 +94,10 @@ src_configure() { local myconf=( --nopyc --nopyo + --enable-pylib ext --refclock="${CLOCKSTRING}" - --build-epoch="$(date +%s)" - $(use doc && echo "--enable-doc") + #--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") @@ -114,6 +124,7 @@ src_compile() { src_install() { python_install() { waf-utils_src_install + python_fix_shebang "${ED}" } python_foreach_impl run_in_build_dir python_install python_foreach_impl python_optimize