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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B964C138239 for ; Mon, 30 Dec 2019 12:59:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 386C6E0BB5; Mon, 30 Dec 2019 12:59:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F3960E0BB5 for ; Mon, 30 Dec 2019 12:59:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7F2B034DD60 for ; Mon, 30 Dec 2019 12:59:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E3509A6 for ; Mon, 30 Dec 2019 12:59:09 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1577710738.8f8b4aff201b3ba77d7cbd26fad8e1797b5e3126.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/, eclass/tests/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/python-utils-r1.eclass eclass/tests/python-utils-r1.sh X-VCS-Directories: eclass/ eclass/tests/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 8f8b4aff201b3ba77d7cbd26fad8e1797b5e3126 X-VCS-Branch: master Date: Mon, 30 Dec 2019 12:59:09 +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: 14a4bdb5-3284-4471-9fa9-83310cdaeb10 X-Archives-Hash: cf962aa45c28922819d50670966cf057 commit: 8f8b4aff201b3ba77d7cbd26fad8e1797b5e3126 Author: Michał Górny gentoo org> AuthorDate: Mon Dec 30 12:32:33 2019 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Dec 30 12:58:58 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f8b4aff python-utils-r1.eclass: Eliminate virtual/pypy Depend on dev-python/pypy directly, as that's the common package with the new layout. Signed-off-by: Michał Górny gentoo.org> eclass/python-utils-r1.eclass | 4 ++-- eclass/tests/python-utils-r1.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index 301c9a029b5..91a32434dfa 100644 --- a/eclass/python-utils-r1.eclass +++ b/eclass/python-utils-r1.eclass @@ -472,9 +472,9 @@ python_export() { python*) PYTHON_PKG_DEP="dev-lang/python:${impl#python}";; pypy) - PYTHON_PKG_DEP='>=virtual/pypy-5:0=';; + PYTHON_PKG_DEP='>=dev-python/pypy-5:0=';; pypy3) - PYTHON_PKG_DEP='>=virtual/pypy3-5:0=';; + PYTHON_PKG_DEP='>=dev-python/pypy3-5:0=';; jython2.7) PYTHON_PKG_DEP='dev-java/jython:2.7';; *) diff --git a/eclass/tests/python-utils-r1.sh b/eclass/tests/python-utils-r1.sh index 4910b700308..279324e163b 100755 --- a/eclass/tests/python-utils-r1.sh +++ b/eclass/tests/python-utils-r1.sh @@ -109,7 +109,7 @@ if [[ -x /usr/bin/pypy ]]; then test_var PYTHON_SITEDIR pypy "/usr/lib*/pypy2.7/site-packages" test_var PYTHON_INCLUDEDIR pypy "/usr/lib*/pypy2.7/include" fi -test_var PYTHON_PKG_DEP pypy '*virtual/pypy*:0=' +test_var PYTHON_PKG_DEP pypy '*dev-python/pypy*:0=' test_var PYTHON_SCRIPTDIR pypy /usr/lib/python-exec/pypy test_var EPYTHON pypy3 pypy3 @@ -118,7 +118,7 @@ if [[ -x /usr/bin/pypy3 ]]; then test_var PYTHON_SITEDIR pypy3 "/usr/lib*/pypy3.?/site-packages" test_var PYTHON_INCLUDEDIR pypy3 "/usr/lib*/pypy3.?/include" fi -test_var PYTHON_PKG_DEP pypy3 '*virtual/pypy3*:0=' +test_var PYTHON_PKG_DEP pypy3 '*dev-python/pypy3*:0=' test_var PYTHON_SCRIPTDIR pypy3 /usr/lib/python-exec/pypy3 test_is "python_is_python3 python2.7" 1