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 A89FB158094 for ; Sun, 2 Oct 2022 16:19:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EB836E0976; Sun, 2 Oct 2022 16:18:51 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 B9CCAE0973 for ; Sun, 2 Oct 2022 16:18:51 +0000 (UTC) From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= To: gentoo-dev@lists.gentoo.org Cc: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Subject: [gentoo-dev] [PATCH 4/4] distutils-r1.eclass: Remove obsolete EAPI condition for *.pth files Date: Sun, 2 Oct 2022 18:18:40 +0200 Message-Id: <20221002161840.5552-4-mgorny@gentoo.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221002161840.5552-1-mgorny@gentoo.org> References: <20221002161840.5552-1-mgorny@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Archives-Salt: 5001d815-1807-4a1c-899a-efef776b1a7e X-Archives-Hash: bb53c35e50bd1223dd1d9c6be5ff548f Remove the EAPI condition for *.pth files, as they are banned in all EAPIs currently supported by the eclass. Signed-off-by: Michał Górny --- eclass/distutils-r1.eclass | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index d667b31191e2..5a622689b979 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -2023,21 +2023,19 @@ _distutils-r1_check_namespace_pth() { done < <(find "${ED%/}" -name '*-nspkg.pth' -print0) if [[ ${pth[@]} ]]; then - ewarn "The following *-nspkg.pth files were found installed:" - ewarn + eerror "The following *-nspkg.pth files were found installed:" + eerror for f in "${pth[@]}"; do - ewarn " ${f#${ED%/}}" + eerror " ${f#${ED%/}}" done - ewarn - ewarn "The presence of those files may break namespaces in Python 3.5+. Please" - ewarn "read our documentation on reliable handling of namespaces and update" - ewarn "the ebuild accordingly:" - ewarn - ewarn " https://projects.gentoo.org/python/guide/concept.html#namespace-packages" - - if ! has "${EAPI}" 6 7 8; then - die "*-nspkg.pth files are banned in EAPI ${EAPI}" - fi + eerror + eerror "The presence of those files may break namespaces in Python 3.5+. Please" + eerror "read our documentation on reliable handling of namespaces and update" + eerror "the ebuild accordingly:" + eerror + eerror " https://projects.gentoo.org/python/guide/concept.html#namespace-packages" + + die "Installing *-nspkg.pth files is banned" fi } -- 2.37.3