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 B805A1396DA 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 0F664E10EB; Sat, 11 Nov 2017 15:07:42 +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 E2D55E10EB 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 D34BC33D3CE 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 545419956 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: <1510412847.c39181e9cbaa1fc3d27531a0b6c207181e3bdf7f.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pypy/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pypy/pypy-5.9.0.ebuild dev-python/pypy/pypy-9999.ebuild X-VCS-Directories: dev-python/pypy/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: c39181e9cbaa1fc3d27531a0b6c207181e3bdf7f 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: 8974f366-b87f-4fb0-9b0f-9ebae0f61d83 X-Archives-Hash: 4b0dcb136506243129cf32d610716e6d commit: c39181e9cbaa1fc3d27531a0b6c207181e3bdf7f Author: Michał Górny gentoo org> AuthorDate: Sat Nov 11 15:01:42 2017 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Nov 11 15:07:27 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c39181e9 dev-python/pypy: 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). Enforce the dependency only when USE=-low-memory, since otherwise CPython is not used, and we can't enforce the dependency on PyPy anyway as it would cause circular deps. Closes: https://bugs.gentoo.org/634306 dev-python/pypy/pypy-5.9.0.ebuild | 13 ++++++++++++- dev-python/pypy/pypy-9999.ebuild | 13 ++++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dev-python/pypy/pypy-5.9.0.ebuild b/dev-python/pypy/pypy-5.9.0.ebuild index cef567ec30c..ce877adabdf 100644 --- a/dev-python/pypy/pypy-5.9.0.ebuild +++ b/dev-python/pypy/pypy-5.9.0.ebuild @@ -36,9 +36,20 @@ RDEPEND=">=sys-libs/zlib-1.1.3:0= dev-tcltk/tix:0= ) !dev-python/pypy-bin:0" +# don't enforce the dep on pypy with USE=low-memory since it's going +# to cause either collisions or circular dep on itself DEPEND="${RDEPEND} doc? ( dev-python/sphinx ) - ${PYTHON_DEPS}" + !low-memory? ( + || ( + dev-python/pypy + dev-python/pypy-bin + ( + dev-lang/python:2.7 + dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)] + ) + ) + )" S="${WORKDIR}/${MY_P}-src" diff --git a/dev-python/pypy/pypy-9999.ebuild b/dev-python/pypy/pypy-9999.ebuild index 08bd414c590..805c5e7f777 100644 --- a/dev-python/pypy/pypy-9999.ebuild +++ b/dev-python/pypy/pypy-9999.ebuild @@ -37,9 +37,20 @@ RDEPEND=">=sys-libs/zlib-1.1.3:0= dev-tcltk/tix:0= ) !dev-python/pypy-bin:0" +# don't enforce the dep on pypy with USE=low-memory since it's going +# to cause either collisions or circular dep on itself DEPEND="${RDEPEND} doc? ( dev-python/sphinx ) - ${PYTHON_DEPS}" + !low-memory? ( + || ( + dev-python/pypy + dev-python/pypy-bin + ( + dev-lang/python:2.7 + dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)] + ) + ) + )" S="${WORKDIR}/${MY_P}-src"