From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1642492-garchives=archives.gentoo.org@lists.gentoo.org> 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 A171415817D for <garchives@archives.gentoo.org>; Fri, 14 Jun 2024 08:03:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 764A2E2BAA; Fri, 14 Jun 2024 08:03:29 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4FFB6E2BAC for <gentoo-commits@lists.gentoo.org>; Fri, 14 Jun 2024 08:03:29 +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 6AB44335DC3 for <gentoo-commits@lists.gentoo.org>; Fri, 14 Jun 2024 08:03:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C17601CE8 for <gentoo-commits@lists.gentoo.org>; Fri, 14 Jun 2024 08:03:26 +0000 (UTC) From: "Sam James" <sam@gentoo.org> 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" <sam@gentoo.org> Message-ID: <1718352108.d7d9ffd7751437e145b5b867efa14f39c9393fc7.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/ntpsec/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/ntpsec/ntpsec-1.2.2a-r1.ebuild net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild net-misc/ntpsec/ntpsec-9999.ebuild X-VCS-Directories: net-misc/ntpsec/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: d7d9ffd7751437e145b5b867efa14f39c9393fc7 X-VCS-Branch: master Date: Fri, 14 Jun 2024 08:03:26 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 024c3c94-3216-4b21-ba5f-fa463e381754 X-Archives-Hash: 86a6e25e25db481b43a000902d9c95b9 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"