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 BEF4E158020 for ; Fri, 25 Nov 2022 17:07:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8335EE0A91; Fri, 25 Nov 2022 17:05:21 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 C87A5E0A89 for ; Fri, 25 Nov 2022 17:05:20 +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 6/7] distutils-r1.eclass: Remove support for gpep517 < 9 Date: Fri, 25 Nov 2022 18:05:07 +0100 Message-Id: <20221125170508.23064-7-mgorny@gentoo.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221125170508.23064-1-mgorny@gentoo.org> References: <20221125170508.23064-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: 8ff99a98-8df9-4c04-aac3-7631c35c8aa1 X-Archives-Hash: 1bef8978eab32d78f1ef924fc1f64150 Signed-off-by: Michał Górny --- eclass/distutils-r1.eclass | 37 ++++++++----------------------------- 1 file changed, 8 insertions(+), 29 deletions(-) diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index 1cc4626f3a12..97c5e562bc0f 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -1265,25 +1265,14 @@ distutils_wheel_install() { local wheel=${2} einfo " Installing ${wheel##*/} to ${root}" - if has_version -b ">=dev-python/gpep517-9"; then - # TODO: inline when we dep on >=9 - local cmd=( - gpep517 install-wheel - --destdir="${root}" - --interpreter="${PYTHON}" - --prefix="${EPREFIX}/usr" - --optimize=all - "${wheel}" - ) - else - local cmd=( - gpep517 install-wheel - --destdir="${root}" - --interpreter="${PYTHON}" - --prefix="${EPREFIX}/usr" - "${wheel}" - ) - fi + local cmd=( + gpep517 install-wheel + --destdir="${root}" + --interpreter="${PYTHON}" + --prefix="${EPREFIX}/usr" + --optimize=all + "${wheel}" + ) printf '%s\n' "${cmd[*]}" "${cmd[@]}" || die "Wheel install failed" @@ -2018,16 +2007,6 @@ _distutils-r1_post_python_install() { die "Package installs '${p}' package which is forbidden and likely a bug in the build system." fi done - - if [[ ${DISTUTILS_USE_PEP517} ]]; then - if ! has_version -b ">=dev-python/gpep517-9" - then - # TODO: remove when we dep on >=9 - # we need to recompile everything here in order to embed - # the correct paths - python_optimize "${sitedir}" - fi - fi fi } -- 2.38.1