commit: 84007c1b3c3a34a4bf8daaf897f31340e4d27e83
Author: Horea Christian <horea.christ <AT> yandex <DOT> com>
AuthorDate: Mon Jul 25 18:47:29 2016 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Jul 25 18:47:29 2016 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=84007c1b
Psychopy improvements (#652)
* sci-biology/psychopy: fixed older ebuild
Package-Manager: portage-2.3.0
* sci-biology/psychopy: downloading from archives
Package-Manager: portage-2.3.0
* sci-biology/psychopy: added format for distfile
Package-Manager: portage-2.3.0
* sci-biology/psychopy: downloading as tar.gz
Package-Manager: portage-2.3.0
* sci-biology/psychopy: switched to .tar.gz and appropriate ${S}
Package-Manager: portage-2.3.0
* sci-biology/psychopy: updated EAPI
Package-Manager: portage-2.3.0
sci-biology/psychopy/psychopy-1.78.00.ebuild | 42 ++++++++++------------------
sci-biology/psychopy/psychopy-1.83.03.ebuild | 4 +--
sci-biology/psychopy/psychopy-9999.ebuild | 4 +--
3 files changed, 19 insertions(+), 31 deletions(-)
diff --git a/sci-biology/psychopy/psychopy-1.78.00.ebuild
b/sci-biology/psychopy/psychopy-1.78.00.ebuild
index ae5e24e..cd50a85 100644
--- a/sci-biology/psychopy/psychopy-1.78.00.ebuild
+++ b/sci-biology/psychopy/psychopy-1.78.00.ebuild
@@ -1,51 +1,39 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="5"
+EAPI="6"
PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1 gnome2-utils eutils
-
-MY_P="PsychoPy-${PV}"
+inherit eutils gnome2-utils distutils-r1
DESCRIPTION="Python experimental psychology toolkit"
HOMEPAGE="http://www.psychopy.org/";
-SRC_URI="http://sourceforge.net/projects/psychpy/files/PsychoPy/${MY_P}.zip";
+SRC_URI="https://github.com/psychopy/psychopy/archive/${PV}.tar.gz ->
${P}.tar.gz"
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}]
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/wxpython:*[${PYTHON_USEDEP}]
+DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
+ "
+RDEPEND="dev-python/pillow[${PYTHON_USEDEP}]
dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/pyglet[${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}]
"
-DEPEND="
- 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
+ newicon -s scalable psychopy/monitors/psychopy-icon.svg psychopy.svg
+ make_desktop_entry psychopyApp.py PsychoPy psychopy
}
pkg_postinst() {
diff --git a/sci-biology/psychopy/psychopy-1.83.03.ebuild
b/sci-biology/psychopy/psychopy-1.83.03.ebuild
index c22a368..cd50a85 100644
--- a/sci-biology/psychopy/psychopy-1.83.03.ebuild
+++ b/sci-biology/psychopy/psychopy-1.83.03.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="5"
+EAPI="6"
PYTHON_COMPAT=( python2_7 )
@@ -10,7 +10,7 @@ inherit eutils gnome2-utils distutils-r1
DESCRIPTION="Python experimental psychology toolkit"
HOMEPAGE="http://www.psychopy.org/";
-SRC_URI="https://github.com/psychopy/psychopy/releases/download/${PV}/${P}.zip";
+SRC_URI="https://github.com/psychopy/psychopy/archive/${PV}.tar.gz ->
${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
diff --git a/sci-biology/psychopy/psychopy-9999.ebuild
b/sci-biology/psychopy/psychopy-9999.ebuild
index f2a2c00..f463a57 100644
--- a/sci-biology/psychopy/psychopy-9999.ebuild
+++ b/sci-biology/psychopy/psychopy-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="5"
+EAPI="6"
PYTHON_COMPAT=( python2_7 )
