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 A90D61381F3 for ; Mon, 10 Jun 2013 11:57:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9A8F5E0952; Mon, 10 Jun 2013 11:57:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 23FC3E0952 for ; Mon, 10 Jun 2013 11:57:31 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4AE2433E140 for ; Mon, 10 Jun 2013 11:57:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id E0D73E468F for ; Mon, 10 Jun 2013 11:57:26 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1370863765.3188bb6d70fc928be0967a351743fe3c785fc759.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-biology/psychopy/ X-VCS-Repository: proj/sci X-VCS-Files: sci-biology/psychopy/ChangeLog sci-biology/psychopy/metadata.xml sci-biology/psychopy/psychopy-1.75.01.ebuild sci-biology/psychopy/psychopy-9999.ebuild X-VCS-Directories: sci-biology/psychopy/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 3188bb6d70fc928be0967a351743fe3c785fc759 X-VCS-Branch: master Date: Mon, 10 Jun 2013 11:57:26 +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: 387cccc8-1c75-4937-93f5-d4f29996a287 X-Archives-Hash: 6b29fdf42f8baa003cd105c6334e0f92 commit: 3188bb6d70fc928be0967a351743fe3c785fc759 Author: Justin Lecher gentoo org> AuthorDate: Mon Jun 10 11:03:27 2013 +0000 Commit: Justin Lecher gentoo org> CommitDate: Mon Jun 10 11:29:25 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=3188bb6d sci-biology/psychopy: Add missing python use dep, move to virtual/python-imaging Package-Manager: portage-2.2.0_alpha179 --- sci-biology/psychopy/ChangeLog | 8 ++++++++ sci-biology/psychopy/metadata.xml | 8 ++++---- sci-biology/psychopy/psychopy-1.75.01.ebuild | 24 +++++++++++------------- sci-biology/psychopy/psychopy-9999.ebuild | 18 ++++++++++-------- 4 files changed, 33 insertions(+), 25 deletions(-) diff --git a/sci-biology/psychopy/ChangeLog b/sci-biology/psychopy/ChangeLog new file mode 100644 index 0000000..67c7acd --- /dev/null +++ b/sci-biology/psychopy/ChangeLog @@ -0,0 +1,8 @@ +# ChangeLog for sci-biology/psychopy +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + + 10 Jun 2013; Justin Lecher psychopy-1.75.01.ebuild, + psychopy-9999.ebuild, metadata.xml: + Add missing python use dep, move to virtual/python-imaging + diff --git a/sci-biology/psychopy/metadata.xml b/sci-biology/psychopy/metadata.xml index c791a24..6d519f5 100644 --- a/sci-biology/psychopy/metadata.xml +++ b/sci-biology/psychopy/metadata.xml @@ -1,8 +1,8 @@ - - h.chr@mail.ru - TheChymera - + + h.chr@mail.ru + TheChymera + diff --git a/sci-biology/psychopy/psychopy-1.75.01.ebuild b/sci-biology/psychopy/psychopy-1.75.01.ebuild index ee50eb0..f4469ce 100644 --- a/sci-biology/psychopy/psychopy-1.75.01.ebuild +++ b/sci-biology/psychopy/psychopy-1.75.01.ebuild @@ -3,12 +3,8 @@ # $Header: $ EAPI="5" -PYTHON_COMPAT=( python2_7 ) -PYTHON_DEPEND="2" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="3.* *-jython *-pypy-*" -DISTUTILS_SRC_TEST="py.test" +PYTHON_COMPAT=( python2_7 ) inherit distutils-r1 gnome2-utils eutils @@ -17,25 +13,27 @@ MY_P="PsychoPy-${PV}" DESCRIPTION="Python experimental psychology toolkit" HOMEPAGE="http://www.psychopy.org/" SRC_URI="http://psychopy.googlecode.com/files/${MY_P}.zip" + LICENSE="GPL-3+" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="test" -RDEPEND="dev-python/numpy[lapack] - sci-libs/scipy - dev-python/matplotlib +RDEPEND=" + dev-python/numpy[lapack,${PYTHON_USEDEP}] + sci-libs/scipy[${PYTHON_USEDEP}] + dev-python/matplotlib[${PYTHON_USEDEP}] dev-python/pyopengl[${PYTHON_USEDEP}] - dev-python/imaging - dev-python/wxpython + virtual/python-imaging[${PYTHON_USEDEP}] + dev-python/wxpython[${PYTHON_USEDEP}] dev-python/setuptools[${PYTHON_USEDEP}] dev-python/lxml[${PYTHON_USEDEP}] app-admin/eselect - dev-python/pyglet - dev-python/pygame" + dev-python/pyglet[${PYTHON_USEDEP}] + dev-python/pygame[${PYTHON_USEDEP}]" DEPEND="app-arch/unzip - dev-python/setuptools + dev-python/setuptools[${PYTHON_USEDEP}] test? ( ${RDEPEND} )" RESTRICT="test" # interactive, opens lots of windows diff --git a/sci-biology/psychopy/psychopy-9999.ebuild b/sci-biology/psychopy/psychopy-9999.ebuild index 7511293..cc02416 100644 --- a/sci-biology/psychopy/psychopy-9999.ebuild +++ b/sci-biology/psychopy/psychopy-9999.ebuild @@ -3,13 +3,15 @@ # $Header: $ EAPI="5" + PYTHON_COMPAT=( python2_7 ) inherit eutils gnome2-utils distutils-r1 git-2 -DESCRIPTION="Python experiemntal psychology toolkit" +DESCRIPTION="Python experimental psychology toolkit" HOMEPAGE="http://www.psychopy.org/" EGIT_REPO_URI="https://github.com/psychopy/psychopy.git" + LICENSE="GPL-3+" SLOT="0" KEYWORDS="~amd64 ~x86" @@ -18,15 +20,15 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" RDEPEND="${DEPEND} app-admin/eselect - dev-python/imaging + virtual/python-imaging[${PYTHON_USEDEP}] dev-python/lxml[${PYTHON_USEDEP}] - dev-python/matplotlib - dev-python/numpy[lapack] - dev-python/pygame - dev-python/pyglet + dev-python/matplotlib[${PYTHON_USEDEP}] + dev-python/numpy[lapack,${PYTHON_USEDEP}] + dev-python/pygame[${PYTHON_USEDEP}] + dev-python/pyglet[${PYTHON_USEDEP}] dev-python/pyopengl[${PYTHON_USEDEP}] - dev-python/wxpython - sci-libs/scipy" + dev-python/wxpython[${PYTHON_USEDEP}] + sci-libs/scipy[${PYTHON_USEDEP}]" python_install_all() { distutils-r1_python_install_all