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 B806415817D 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 D816FE2BB5; Fri, 14 Jun 2024 08:03:30 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 B9AD6E2BB5 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 CB3F6335C9B 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 1DBA01CED 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: <1718352114.cfc29c8eec7c629fe1a4f40d4e7c0bea616ef589.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: cfc29c8eec7c629fe1a4f40d4e7c0bea616ef589 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: ee0023bc-c8fb-4dfb-8657-b2ae21405140 X-Archives-Hash: 2d08adedd33dfbdfd96026aa09fcb00c commit: cfc29c8eec7c629fe1a4f40d4e7c0bea616ef589 Author: James Browning gmail com> AuthorDate: Thu Jun 6 11:12:35 2024 +0000 Commit: Sam James gentoo org> CommitDate: Fri Jun 14 08:01:54 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfc29c8e net-misc/ntpsec: Solve conflicting modules problem gpep517 install-wheel throws a fit if run after waf-utils_src_install for the same Python. Bug: https://bugs.gentoo.org/910009 Bug: https://bugs.gentoo.org/922819 Signed-off-by: James Browning gmail.com> Signed-off-by: Sam James gentoo.org> net-misc/ntpsec/ntpsec-1.2.2a-r1.ebuild | 2 +- net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild | 2 +- net-misc/ntpsec/ntpsec-9999.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net-misc/ntpsec/ntpsec-1.2.2a-r1.ebuild b/net-misc/ntpsec/ntpsec-1.2.2a-r1.ebuild index c914d33d6e0c..44d6ac637a26 100644 --- a/net-misc/ntpsec/ntpsec-1.2.2a-r1.ebuild +++ b/net-misc/ntpsec/ntpsec-1.2.2a-r1.ebuild @@ -159,13 +159,13 @@ 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 - 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 + waf-utils_src_install --notests python_fix_shebang "${ED}" python_optimize } diff --git a/net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild b/net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild index c1ad553122ae..367b9c6b8fe3 100644 --- a/net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild +++ b/net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild @@ -155,13 +155,13 @@ 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 - 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 + waf-utils_src_install --notests python_fix_shebang "${ED}" python_optimize } diff --git a/net-misc/ntpsec/ntpsec-9999.ebuild b/net-misc/ntpsec/ntpsec-9999.ebuild index c656c7343aab..2bc971ead230 100644 --- a/net-misc/ntpsec/ntpsec-9999.ebuild +++ b/net-misc/ntpsec/ntpsec-9999.ebuild @@ -155,13 +155,13 @@ 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 - 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 + waf-utils_src_install --notests python_fix_shebang "${ED}" python_optimize }