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 D1B2B1396D9 for ; Sat, 11 Nov 2017 15:07:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CD00CE10EA; Sat, 11 Nov 2017 15:07:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 AD088E10DE for ; Sat, 11 Nov 2017 15:07:41 +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 C5FD833D3C7 for ; Sat, 11 Nov 2017 15:07:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6870B9957 for ; Sat, 11 Nov 2017 15:07:39 +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: <1510412848.7c9feafd05d62ac42c8cafb3b82fcc7e7623f083.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pypy3/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pypy3/pypy3-5.9.0.ebuild dev-python/pypy3/pypy3-9999.ebuild X-VCS-Directories: dev-python/pypy3/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 7c9feafd05d62ac42c8cafb3b82fcc7e7623f083 X-VCS-Branch: master Date: Sat, 11 Nov 2017 15:07:39 +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-Archives-Salt: 95d28bbd-aed9-4645-a1af-6010111be00d X-Archives-Hash: 6a33d373788284a0c9d979e660569046 commit: 7c9feafd05d62ac42c8cafb3b82fcc7e7623f083 Author: Michał Górny gentoo org> AuthorDate: Sat Nov 11 15:04:22 2017 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Nov 11 15:07:28 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c9feafd dev-python/pypy3: Inline deps and include dev-python/pycparser dep Replace the autogenerated || dependency with an inlined version, and include dev-python/pycparser in it when using CPython 2.7 (it is built-in in dev-python/pypy, through CFFI). dev-python/pypy3/pypy3-5.9.0.ebuild | 12 ++++++++++-- dev-python/pypy3/pypy3-9999.ebuild | 12 ++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dev-python/pypy3/pypy3-5.9.0.ebuild b/dev-python/pypy3/pypy3-5.9.0.ebuild index 68ba1a3ef97..d81c5775b40 100644 --- a/dev-python/pypy3/pypy3-5.9.0.ebuild +++ b/dev-python/pypy3/pypy3-5.9.0.ebuild @@ -35,8 +35,16 @@ RDEPEND=">=sys-libs/zlib-1.1.3:0= ) !dev-python/pypy3-bin:0" DEPEND="${RDEPEND} - low-memory? ( virtual/pypy:0 ) - !low-memory? ( ${PYTHON_DEPS} )" + low-memory? ( virtual/pypy ) + !low-memory? ( + || ( + virtual/pypy + ( + dev-lang/python:2.7 + dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)] + ) + ) + )" # doc? ( dev-python/sphinx ) S="${WORKDIR}/${MY_P}-src" diff --git a/dev-python/pypy3/pypy3-9999.ebuild b/dev-python/pypy3/pypy3-9999.ebuild index 92c2f84f5b0..5be752f1fc4 100644 --- a/dev-python/pypy3/pypy3-9999.ebuild +++ b/dev-python/pypy3/pypy3-9999.ebuild @@ -36,8 +36,16 @@ RDEPEND=">=sys-libs/zlib-1.1.3:0= ) !dev-python/pypy3-bin:0" DEPEND="${RDEPEND} - low-memory? ( virtual/pypy:0 ) - !low-memory? ( ${PYTHON_DEPS} )" + low-memory? ( virtual/pypy ) + !low-memory? ( + || ( + virtual/pypy + ( + dev-lang/python:2.7 + dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)] + ) + ) + )" # doc? ( dev-python/sphinx ) # Who would care about predictable directory names?