[gentoo-commits] proj/sci:master commit in: sci-biology/psychopy/

["Justin Lecher" <jlec@gentoo.org>]

commit:     3188bb6d70fc928be0967a351743fe3c785fc759
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 10 11:03:27 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> 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 <jlec@gentoo.org> 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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>h.chr@mail.ru</email>
-		<name>TheChymera</name>
-	</maintainer>
+  <maintainer>
+    <email>h.chr@mail.ru</email>
+    <name>TheChymera</name>
+  </maintainer>
 </pkgmetadata>

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