commit: d9ef580e2e0d2eb230c7e64d4ac626bab347c8f1
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 18 13:42:24 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Feb 18 13:42:24 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d9ef580e
sci-biology/psychopy: fix SLOT operators
Package-Manager: portage-2.2.17
---
sci-biology/psychopy/ChangeLog | 7 +++-
sci-biology/psychopy/psychopy-1.75.01.ebuild | 56 ----------------------------
sci-biology/psychopy/psychopy-1.77.02.ebuild | 56 ----------------------------
sci-biology/psychopy/psychopy-1.78.00.ebuild | 4 +-
sci-biology/psychopy/psychopy-9999.ebuild | 4 +-
5 files changed, 9 insertions(+), 118 deletions(-)
diff --git a/sci-biology/psychopy/ChangeLog b/sci-biology/psychopy/ChangeLog
index a96dfee..49cc4a4 100644
--- a/sci-biology/psychopy/ChangeLog
+++ b/sci-biology/psychopy/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for sci-biology/psychopy
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 18 Feb 2015; Justin Lecher <j...@gentoo.org> -psychopy-1.75.01.ebuild,
+ -psychopy-1.77.02.ebuild, psychopy-1.78.00.ebuild, psychopy-9999.ebuild:
+ sci-biology/psychopy: fix SLOT operators
+
06 Jan 2014; Justin Lecher <j...@gentoo.org> psychopy-9999.ebuild:
Switch from git-2 to git-r3
10 Jun 2013; Justin Lecher <j...@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/psychopy-1.75.01.ebuild
b/sci-biology/psychopy/psychopy-1.75.01.ebuild
deleted file mode 100644
index a7a3eae..0000000
--- a/sci-biology/psychopy/psychopy-1.75.01.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 gnome2-utils eutils
-
-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,${PYTHON_USEDEP}]
- sci-libs/scipy[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/pyopengl[${PYTHON_USEDEP}]
- virtual/python-imaging[${PYTHON_USEDEP}]
- dev-python/wxpython[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/pyglet[${PYTHON_USEDEP}]
- dev-python/pygame[${PYTHON_USEDEP}]
- "
-
-DEPEND="app-admin/eselect
- app-arch/unzip
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( ${RDEPEND} )
- "
-
-RESTRICT="test" # interactive, opens lots of windows
-
-S="${WORKDIR}/${MY_P}"
-
-python_install_all() {
- distutils-r1_python_install_all
- doicon psychopy/monitors/psychopy.ico
- 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.77.02.ebuild
b/sci-biology/psychopy/psychopy-1.77.02.ebuild
deleted file mode 100644
index a7a3eae..0000000
--- a/sci-biology/psychopy/psychopy-1.77.02.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 gnome2-utils eutils
-
-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,${PYTHON_USEDEP}]
- sci-libs/scipy[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/pyopengl[${PYTHON_USEDEP}]
- virtual/python-imaging[${PYTHON_USEDEP}]
- dev-python/wxpython[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/pyglet[${PYTHON_USEDEP}]
- dev-python/pygame[${PYTHON_USEDEP}]
- "
-
-DEPEND="app-admin/eselect
- app-arch/unzip
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( ${RDEPEND} )
- "
-
-RESTRICT="test" # interactive, opens lots of windows
-
-S="${WORKDIR}/${MY_P}"
-
-python_install_all() {
- distutils-r1_python_install_all
- doicon psychopy/monitors/psychopy.ico
- 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.78.00.ebuild
b/sci-biology/psychopy/psychopy-1.78.00.ebuild
index e494b78..864a1d3 100644
--- a/sci-biology/psychopy/psychopy-1.78.00.ebuild
+++ b/sci-biology/psychopy/psychopy-1.78.00.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -25,7 +25,7 @@ RDEPEND="
dev-python/matplotlib[${PYTHON_USEDEP}]
dev-python/pyopengl[${PYTHON_USEDEP}]
virtual/python-imaging[${PYTHON_USEDEP}]
- dev-python/wxpython[${PYTHON_USEDEP}]
+ dev-python/wxpython:*[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]
dev-python/lxml[${PYTHON_USEDEP}]
dev-python/pyglet[${PYTHON_USEDEP}]
diff --git a/sci-biology/psychopy/psychopy-9999.ebuild
b/sci-biology/psychopy/psychopy-9999.ebuild
index cb8f2fe..6d7a5bc 100644
--- a/sci-biology/psychopy/psychopy-9999.ebuild
+++ b/sci-biology/psychopy/psychopy-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -28,7 +28,7 @@ RDEPEND="${DEPEND}
dev-python/pygame[${PYTHON_USEDEP}]
dev-python/pyglet[${PYTHON_USEDEP}]
dev-python/pyopengl[${PYTHON_USEDEP}]
- dev-python/wxpython[${PYTHON_USEDEP}]
+ dev-python/wxpython:*[${PYTHON_USEDEP}]
sci-libs/scipy[${PYTHON_USEDEP}]
"
