From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 9E90613988E for ; Sun, 23 Aug 2015 03:08:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ADB35E0897; Sun, 23 Aug 2015 03:08:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 92A09E0895 for ; Sun, 23 Aug 2015 03:08:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9E3B83408BC for ; Sun, 23 Aug 2015 03:08:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7C61E162 for ; Sun, 23 Aug 2015 03:08:53 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1440297717.0e23f54cd2fded0aca4aad1ea475f74f313ad267.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/cairocffi/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/cairocffi/cairocffi-0.5.3-r1.ebuild dev-python/cairocffi/cairocffi-0.5.4.ebuild dev-python/cairocffi/cairocffi-0.6-r1.ebuild dev-python/cairocffi/cairocffi-0.6.ebuild dev-python/cairocffi/cairocffi-0.7.1.ebuild dev-python/cairocffi/cairocffi-0.7.2.ebuild X-VCS-Directories: dev-python/cairocffi/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 0e23f54cd2fded0aca4aad1ea475f74f313ad267 X-VCS-Branch: master Date: Sun, 23 Aug 2015 03:08:53 +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: 2dd79133-f7fe-46a9-8837-cfd47d49139d X-Archives-Hash: ec35fe8103acaa66f836628fb8393325 commit: 0e23f54cd2fded0aca4aad1ea475f74f313ad267 Author: Sean Vig gmail com> AuthorDate: Sat Aug 22 23:10:58 2015 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sun Aug 23 02:41:57 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e23f54c dev-python/cairocffi: Don't enable pypy Python target on dev-python/cffi Also, check that new enough (>=2.6.0) PyPy installed to ensure correct cffi version. dev-python/cairocffi/cairocffi-0.5.3-r1.ebuild | 3 ++- dev-python/cairocffi/cairocffi-0.5.4.ebuild | 3 ++- dev-python/cairocffi/cairocffi-0.6-r1.ebuild | 2 +- dev-python/cairocffi/cairocffi-0.6.ebuild | 2 +- dev-python/cairocffi/cairocffi-0.7.1.ebuild | 8 +++++--- dev-python/cairocffi/cairocffi-0.7.2.ebuild | 8 +++++--- 6 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dev-python/cairocffi/cairocffi-0.5.3-r1.ebuild b/dev-python/cairocffi/cairocffi-0.5.3-r1.ebuild index 02d50b7..b09276c 100644 --- a/dev-python/cairocffi/cairocffi-0.5.3-r1.ebuild +++ b/dev-python/cairocffi/cairocffi-0.5.3-r1.ebuild @@ -18,7 +18,8 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="doc test" -RDEPEND=">=dev-python/cffi-0.6:=[${PYTHON_USEDEP}] +RDEPEND=" + $(python_gen_cond_dep '>=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]' 'python*') x11-libs/cairo:0=" DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) diff --git a/dev-python/cairocffi/cairocffi-0.5.4.ebuild b/dev-python/cairocffi/cairocffi-0.5.4.ebuild index 02d50b7..b09276c 100644 --- a/dev-python/cairocffi/cairocffi-0.5.4.ebuild +++ b/dev-python/cairocffi/cairocffi-0.5.4.ebuild @@ -18,7 +18,8 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="doc test" -RDEPEND=">=dev-python/cffi-0.6:=[${PYTHON_USEDEP}] +RDEPEND=" + $(python_gen_cond_dep '>=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]' 'python*') x11-libs/cairo:0=" DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) diff --git a/dev-python/cairocffi/cairocffi-0.6-r1.ebuild b/dev-python/cairocffi/cairocffi-0.6-r1.ebuild index b760032..77ff6bf 100644 --- a/dev-python/cairocffi/cairocffi-0.6-r1.ebuild +++ b/dev-python/cairocffi/cairocffi-0.6-r1.ebuild @@ -21,7 +21,7 @@ IUSE="doc test" # xcffib is an optional extra excpet that the testsuite has it a hard coded unconditional component RDEPEND=" - >=dev-python/cffi-0.6:=[${PYTHON_USEDEP}] + $(python_gen_cond_dep '>=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]' 'python*') x11-libs/cairo:0= =virtual/pypy-2.6.0' pypy )" DEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] @@ -32,7 +33,8 @@ DEPEND=" test? ( ${RDEPEND} dev-python/pytest[${PYTHON_USEDEP}] - )" + ) + $(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )" PATCHES=( # Intersphinx cause the usual d'loading of objects.inv from TWO online sites diff --git a/dev-python/cairocffi/cairocffi-0.7.2.ebuild b/dev-python/cairocffi/cairocffi-0.7.2.ebuild index 8aa7b95..b9396d0 100644 --- a/dev-python/cairocffi/cairocffi-0.7.2.ebuild +++ b/dev-python/cairocffi/cairocffi-0.7.2.ebuild @@ -21,10 +21,11 @@ KEYWORDS="~amd64 ~x86" IUSE="doc test" RDEPEND=" - >=dev-python/cffi-1.1.0:=[$(python_gen_usedep 'python*')] + $(python_gen_cond_dep '>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]' 'python*') >=dev-python/xcffib-0.3.2[${PYTHON_USEDEP}] x11-libs/cairo:0= - x11-libs/gdk-pixbuf[jpeg]" + x11-libs/gdk-pixbuf[jpeg] + $(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )" DEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] @@ -32,7 +33,8 @@ DEPEND=" test? ( ${RDEPEND} dev-python/pytest[${PYTHON_USEDEP}] - )" + ) + $(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )" PATCHES=( # Intersphinx cause the usual d'loading of objects.inv from TWO online sites