diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-04-11 08:20:55 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-04-11 08:20:55 +0000 |
| commit | 3290c84d9e0ca4b98133942e52cf5cc6a6795b1f (patch) | |
| tree | 1021a41d787575714f0f6014866c8ab7aedbaf79 /dev-python/pypy | |
| parent | set dep pyzmq to required version, thx to report in Bug #507296 by W. King (diff) | |
| download | gentoo-2-3290c84d9e0ca4b98133942e52cf5cc6a6795b1f.tar.gz gentoo-2-3290c84d9e0ca4b98133942e52cf5cc6a6795b1f.tar.bz2 gentoo-2-3290c84d9e0ca4b98133942e52cf5cc6a6795b1f.zip | |
Add a mutual blocker on pypy-bin.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'dev-python/pypy')
| -rw-r--r-- | dev-python/pypy/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-python/pypy/pypy-2.0.2-r1.ebuild | 5 | ||||
| -rw-r--r-- | dev-python/pypy/pypy-2.2.1.ebuild | 5 |
3 files changed, 11 insertions, 5 deletions
diff --git a/dev-python/pypy/ChangeLog b/dev-python/pypy/ChangeLog index ceaf5b10832d..0014b22f65a8 100644 --- a/dev-python/pypy/ChangeLog +++ b/dev-python/pypy/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/pypy # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v 1.59 2014/03/31 21:24:18 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v 1.60 2014/04/11 08:20:55 mgorny Exp $ + + 11 Apr 2014; Michał Górny <mgorny@gentoo.org> pypy-2.0.2-r1.ebuild, + pypy-2.2.1.ebuild: + Add a mutual blocker on pypy-bin. 31 Mar 2014; Michał Górny <mgorny@gentoo.org> pypy-2.0.2-r1.ebuild, pypy-2.0.2.ebuild, pypy-2.2.1.ebuild: diff --git a/dev-python/pypy/pypy-2.0.2-r1.ebuild b/dev-python/pypy/pypy-2.0.2-r1.ebuild index 6621fa75bc18..cc684da94fad 100644 --- a/dev-python/pypy/pypy-2.0.2-r1.ebuild +++ b/dev-python/pypy/pypy-2.0.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-2.0.2-r1.ebuild,v 1.2 2014/03/31 21:24:18 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-2.0.2-r1.ebuild,v 1.3 2014/04/11 08:20:55 mgorny Exp $ EAPI=5 @@ -24,7 +24,8 @@ RDEPEND=">=sys-libs/zlib-1.1.3 dev-libs/openssl bzip2? ( app-arch/bzip2 ) ncurses? ( sys-libs/ncurses ) - sqlite? ( dev-db/sqlite:3 )" + sqlite? ( dev-db/sqlite:3 ) + !dev-python/pypy-bin:0" DEPEND="${RDEPEND} doc? ( dev-python/sphinx ) ${PYTHON_DEPS}" diff --git a/dev-python/pypy/pypy-2.2.1.ebuild b/dev-python/pypy/pypy-2.2.1.ebuild index 757086480ae2..c7d9e255e04f 100644 --- a/dev-python/pypy/pypy-2.2.1.ebuild +++ b/dev-python/pypy/pypy-2.2.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-2.2.1.ebuild,v 1.3 2014/03/31 21:24:18 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-2.2.1.ebuild,v 1.4 2014/04/11 08:20:55 mgorny Exp $ EAPI=5 @@ -24,7 +24,8 @@ RDEPEND=">=sys-libs/zlib-1.1.3 dev-libs/openssl bzip2? ( app-arch/bzip2 ) ncurses? ( sys-libs/ncurses ) - sqlite? ( dev-db/sqlite:3 )" + sqlite? ( dev-db/sqlite:3 ) + !dev-python/pypy-bin:0" DEPEND="${RDEPEND} doc? ( dev-python/sphinx ) ${PYTHON_DEPS}" |