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

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

commit:     20b3da3a40ae20ad0c2d1f158551827198ebf0c8
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 12 09:28:06 2016 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Nov 12 09:28:06 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=20b3da3a

sci-biology/psychopy: Fix python dependency in media-libs/opencv

Drop old

Package-Manager: portage-2.3.2
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sci-biology/psychopy/psychopy-1.78.00.ebuild | 45 ---------------------------
 sci-biology/psychopy/psychopy-1.83.03.ebuild | 46 ----------------------------
 sci-biology/psychopy/psychopy-1.84.0.ebuild  |  2 +-
 sci-biology/psychopy/psychopy-1.84.1.ebuild  |  2 +-
 sci-biology/psychopy/psychopy-9999.ebuild    |  2 +-
 5 files changed, 3 insertions(+), 94 deletions(-)

diff --git a/sci-biology/psychopy/psychopy-1.78.00.ebuild b/sci-biology/psychopy/psychopy-1.78.00.ebuild
deleted file mode 100644
index c55c9b2..0000000
--- a/sci-biology/psychopy/psychopy-1.78.00.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit eutils gnome2-utils distutils-r1
-
-DESCRIPTION="Python experimental psychology toolkit"
-HOMEPAGE="http://www.psychopy.org/"
-SRC_URI="https://github.com/psychopy/psychopy/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	"
-RDEPEND="dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	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:*[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	newicon -s scalable psychopy/monitors/psychopy-icon.svg psychopy.svg
-	make_desktop_entry psychopyApp.py PsychoPy psychopy
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-pkg_postrm() {
-	gnome2_icon_cache_update
-}

diff --git a/sci-biology/psychopy/psychopy-1.83.03.ebuild b/sci-biology/psychopy/psychopy-1.83.03.ebuild
deleted file mode 100644
index 47021b4..0000000
--- a/sci-biology/psychopy/psychopy-1.83.03.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit eutils gnome2-utils distutils-r1
-
-DESCRIPTION="Python experimental psychology toolkit"
-HOMEPAGE="http://www.psychopy.org/"
-SRC_URI="https://github.com/psychopy/psychopy/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	"
-RDEPEND="dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/moviepy[${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:*[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	newicon -s scalable psychopy/monitors/psychopy-icon.svg psychopy.svg
-	make_desktop_entry psychopyApp.py PsychoPy psychopy
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-pkg_postrm() {
-	gnome2_icon_cache_update
-}

diff --git a/sci-biology/psychopy/psychopy-1.84.0.ebuild b/sci-biology/psychopy/psychopy-1.84.0.ebuild
index 4dc03e7..d9b2a30 100644
--- a/sci-biology/psychopy/psychopy-1.84.0.ebuild
+++ b/sci-biology/psychopy/psychopy-1.84.0.ebuild
@@ -32,7 +32,7 @@ RDEPEND="
 	dev-python/pyopengl[${PYTHON_USEDEP}]
 	dev-python/wxpython:*[${PYTHON_USEDEP}]
 	media-libs/avbin-bin
-	media-libs/opencv[python,python_single_target_python2_7]
+	media-libs/opencv[python,${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]
 	"
 

diff --git a/sci-biology/psychopy/psychopy-1.84.1.ebuild b/sci-biology/psychopy/psychopy-1.84.1.ebuild
index 7260f62..b15e00d 100644
--- a/sci-biology/psychopy/psychopy-1.84.1.ebuild
+++ b/sci-biology/psychopy/psychopy-1.84.1.ebuild
@@ -32,7 +32,7 @@ RDEPEND="
 	dev-python/pyopengl[${PYTHON_USEDEP}]
 	dev-python/wxpython:*[${PYTHON_USEDEP}]
 	media-libs/avbin-bin
-	media-libs/opencv[python,python_single_target_python2_7]
+	media-libs/opencv[python,${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]
 	"
 

diff --git a/sci-biology/psychopy/psychopy-9999.ebuild b/sci-biology/psychopy/psychopy-9999.ebuild
index d47914b..3a940a5 100644
--- a/sci-biology/psychopy/psychopy-9999.ebuild
+++ b/sci-biology/psychopy/psychopy-9999.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 	dev-python/pyopengl[${PYTHON_USEDEP}]
 	dev-python/wxpython:*[${PYTHON_USEDEP}]
 	media-libs/avbin-bin
-	media-libs/opencv[python,python_single_target_python2_7]
+	media-libs/opencv[python,${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]
 	"