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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B1D8B158042 for ; Mon, 21 Oct 2024 17:58:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9BFAFE09FB; Mon, 21 Oct 2024 17:57:04 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6429DE09F3 for ; Mon, 21 Oct 2024 17:57:04 +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 3/3] python-utils-r1.eclass: Depend on dev-lang/pypy directly Date: Mon, 21 Oct 2024 19:53:28 +0200 Message-ID: <20241021175655.1377755-4-mgorny@gentoo.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241021175655.1377755-1-mgorny@gentoo.org> References: <20241021175655.1377755-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: 9a99a3ec-b7d6-44ec-be57-128817cf55ad X-Archives-Hash: a3557ba8c8817455270bd19728ce3438 Depend on `>=dev-lang/pypy-3.10:=` rather than the backwards compatibility `dev-python/pypy3` package. Note that the package needs to remain at least for some time after the next subslot bump, so that users rebuild all packages and get the updated dependency across the system. Note that this requires pkgcheck to be updated first. Signed-off-by: Michał Górny --- eclass/python-utils-r1.eclass | 9 ++------- eclass/tests/python-utils-r1.sh | 4 +++- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index 555b6c561a18..1c0e63a2621f 100644 --- a/eclass/python-utils-r1.eclass +++ b/eclass/python-utils-r1.eclass @@ -450,20 +450,15 @@ _python_export() { local d case ${impl} in python*) - PYTHON_PKG_DEP="dev-lang/python:${impl#python}" + PYTHON_PKG_DEP="dev-lang/python:${impl#python}${PYTHON_REQ_USE:+[${PYTHON_REQ_USE}]}" ;; pypy3) - PYTHON_PKG_DEP="dev-python/${impl}:=" + PYTHON_PKG_DEP=">=dev-lang/pypy-3.10:=[symlink${PYTHON_REQ_USE:+,${PYTHON_REQ_USE}}]" ;; *) die "Invalid implementation: ${impl}" esac - # use-dep - if [[ ${PYTHON_REQ_USE} ]]; then - PYTHON_PKG_DEP+=[${PYTHON_REQ_USE}] - fi - export PYTHON_PKG_DEP debug-print "${FUNCNAME}: PYTHON_PKG_DEP = ${PYTHON_PKG_DEP}" ;; diff --git a/eclass/tests/python-utils-r1.sh b/eclass/tests/python-utils-r1.sh index 732f53381b22..81c3c6f78158 100755 --- a/eclass/tests/python-utils-r1.sh +++ b/eclass/tests/python-utils-r1.sh @@ -79,6 +79,7 @@ for minor in {10..13} 13t; do test_var PYTHON_LIBS "python3_${minor}" "*-lpython3.${minor}*" fi test_var PYTHON_PKG_DEP "python3_${minor}" "*dev-lang/python*:3.${minor}" + PYTHON_REQ_USE=sqlite test_var PYTHON_PKG_DEP "python3_${minor}" "*dev-lang/python*:3.${minor}\[sqlite\]" test_var PYTHON_SCRIPTDIR "python3_${minor}" "/usr/lib/python-exec/python3.${minor}" tbegin "Testing that python3_${minor} is present in an impl array" @@ -126,7 +127,8 @@ if [[ -x /usr/bin/pypy3 ]]; then test_var PYTHON_SITEDIR pypy3 "/usr/lib*/pypy3.*/site-packages" test_var PYTHON_INCLUDEDIR pypy3 "/usr/include/pypy3.*" fi -test_var PYTHON_PKG_DEP pypy3 '*dev-python/pypy3*:=' +test_var PYTHON_PKG_DEP pypy3 '*dev-lang/pypy*:=\[symlink\]' +PYTHON_REQ_USE=sqlite test_var PYTHON_PKG_DEP pypy3 '*dev-lang/pypy*:=\[symlink,sqlite\]' test_var PYTHON_SCRIPTDIR pypy3 /usr/lib/python-exec/pypy3 eoutdent -- 2.47.0