| 1 |
commit: 84007c1b3c3a34a4bf8daaf897f31340e4d27e83 |
| 2 |
Author: Horea Christian <horea.christ <AT> yandex <DOT> com> |
| 3 |
AuthorDate: Mon Jul 25 18:47:29 2016 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jul 25 18:47:29 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=84007c1b |
| 7 |
|
| 8 |
Psychopy improvements (#652) |
| 9 |
|
| 10 |
* sci-biology/psychopy: fixed older ebuild |
| 11 |
|
| 12 |
Package-Manager: portage-2.3.0 |
| 13 |
|
| 14 |
* sci-biology/psychopy: downloading from archives |
| 15 |
|
| 16 |
Package-Manager: portage-2.3.0 |
| 17 |
|
| 18 |
* sci-biology/psychopy: added format for distfile |
| 19 |
|
| 20 |
Package-Manager: portage-2.3.0 |
| 21 |
|
| 22 |
* sci-biology/psychopy: downloading as tar.gz |
| 23 |
|
| 24 |
Package-Manager: portage-2.3.0 |
| 25 |
|
| 26 |
* sci-biology/psychopy: switched to .tar.gz and appropriate ${S} |
| 27 |
|
| 28 |
Package-Manager: portage-2.3.0 |
| 29 |
|
| 30 |
* sci-biology/psychopy: updated EAPI |
| 31 |
|
| 32 |
Package-Manager: portage-2.3.0 |
| 33 |
|
| 34 |
sci-biology/psychopy/psychopy-1.78.00.ebuild | 42 ++++++++++------------------ |
| 35 |
sci-biology/psychopy/psychopy-1.83.03.ebuild | 4 +-- |
| 36 |
sci-biology/psychopy/psychopy-9999.ebuild | 4 +-- |
| 37 |
3 files changed, 19 insertions(+), 31 deletions(-) |
| 38 |
|
| 39 |
diff --git a/sci-biology/psychopy/psychopy-1.78.00.ebuild b/sci-biology/psychopy/psychopy-1.78.00.ebuild |
| 40 |
index ae5e24e..cd50a85 100644 |
| 41 |
--- a/sci-biology/psychopy/psychopy-1.78.00.ebuild |
| 42 |
+++ b/sci-biology/psychopy/psychopy-1.78.00.ebuild |
| 43 |
@@ -1,51 +1,39 @@ |
| 44 |
-# Copyright 1999-2015 Gentoo Foundation |
| 45 |
+# Copyright 1999-2016 Gentoo Foundation |
| 46 |
# Distributed under the terms of the GNU General Public License v2 |
| 47 |
# $Id$ |
| 48 |
|
| 49 |
-EAPI="5" |
| 50 |
+EAPI="6" |
| 51 |
|
| 52 |
PYTHON_COMPAT=( python2_7 ) |
| 53 |
|
| 54 |
-inherit distutils-r1 gnome2-utils eutils |
| 55 |
- |
| 56 |
-MY_P="PsychoPy-${PV}" |
| 57 |
+inherit eutils gnome2-utils distutils-r1 |
| 58 |
|
| 59 |
DESCRIPTION="Python experimental psychology toolkit" |
| 60 |
HOMEPAGE="http://www.psychopy.org/" |
| 61 |
-SRC_URI="http://sourceforge.net/projects/psychpy/files/PsychoPy/${MY_P}.zip" |
| 62 |
+SRC_URI="https://github.com/psychopy/psychopy/archive/${PV}.tar.gz -> ${P}.tar.gz" |
| 63 |
|
| 64 |
LICENSE="GPL-3+" |
| 65 |
SLOT="0" |
| 66 |
KEYWORDS="~amd64 ~x86" |
| 67 |
-IUSE="test" |
| 68 |
|
| 69 |
-RDEPEND=" |
| 70 |
- dev-python/numpy[lapack,${PYTHON_USEDEP}] |
| 71 |
- sci-libs/scipy[${PYTHON_USEDEP}] |
| 72 |
- dev-python/matplotlib[${PYTHON_USEDEP}] |
| 73 |
- dev-python/pyopengl[${PYTHON_USEDEP}] |
| 74 |
- dev-python/pillow[${PYTHON_USEDEP}] |
| 75 |
- dev-python/wxpython:*[${PYTHON_USEDEP}] |
| 76 |
+DEPEND=" |
| 77 |
dev-python/setuptools[${PYTHON_USEDEP}] |
| 78 |
+ " |
| 79 |
+RDEPEND="dev-python/pillow[${PYTHON_USEDEP}] |
| 80 |
dev-python/lxml[${PYTHON_USEDEP}] |
| 81 |
- dev-python/pyglet[${PYTHON_USEDEP}] |
| 82 |
+ dev-python/matplotlib[${PYTHON_USEDEP}] |
| 83 |
+ dev-python/numpy[lapack,${PYTHON_USEDEP}] |
| 84 |
dev-python/pygame[${PYTHON_USEDEP}] |
| 85 |
+ dev-python/pyglet[${PYTHON_USEDEP}] |
| 86 |
+ dev-python/pyopengl[${PYTHON_USEDEP}] |
| 87 |
+ dev-python/wxpython:*[${PYTHON_USEDEP}] |
| 88 |
+ sci-libs/scipy[${PYTHON_USEDEP}] |
| 89 |
" |
| 90 |
|
| 91 |
-DEPEND=" |
| 92 |
- app-arch/unzip |
| 93 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
| 94 |
- test? ( ${RDEPEND} ) |
| 95 |
- " |
| 96 |
- |
| 97 |
-RESTRICT="test" # interactive, opens lots of windows |
| 98 |
- |
| 99 |
-S="${WORKDIR}/${MY_P}" |
| 100 |
- |
| 101 |
python_install_all() { |
| 102 |
distutils-r1_python_install_all |
| 103 |
- doicon psychopy/monitors/psychopy.ico |
| 104 |
- make_desktop_entry psychopyapp.py PsychoPy psychopy |
| 105 |
+ newicon -s scalable psychopy/monitors/psychopy-icon.svg psychopy.svg |
| 106 |
+ make_desktop_entry psychopyApp.py PsychoPy psychopy |
| 107 |
} |
| 108 |
|
| 109 |
pkg_postinst() { |
| 110 |
|
| 111 |
diff --git a/sci-biology/psychopy/psychopy-1.83.03.ebuild b/sci-biology/psychopy/psychopy-1.83.03.ebuild |
| 112 |
index c22a368..cd50a85 100644 |
| 113 |
--- a/sci-biology/psychopy/psychopy-1.83.03.ebuild |
| 114 |
+++ b/sci-biology/psychopy/psychopy-1.83.03.ebuild |
| 115 |
@@ -2,7 +2,7 @@ |
| 116 |
# Distributed under the terms of the GNU General Public License v2 |
| 117 |
# $Id$ |
| 118 |
|
| 119 |
-EAPI="5" |
| 120 |
+EAPI="6" |
| 121 |
|
| 122 |
PYTHON_COMPAT=( python2_7 ) |
| 123 |
|
| 124 |
@@ -10,7 +10,7 @@ inherit eutils gnome2-utils distutils-r1 |
| 125 |
|
| 126 |
DESCRIPTION="Python experimental psychology toolkit" |
| 127 |
HOMEPAGE="http://www.psychopy.org/" |
| 128 |
-SRC_URI="https://github.com/psychopy/psychopy/releases/download/${PV}/${P}.zip" |
| 129 |
+SRC_URI="https://github.com/psychopy/psychopy/archive/${PV}.tar.gz -> ${P}.tar.gz" |
| 130 |
|
| 131 |
LICENSE="GPL-3+" |
| 132 |
SLOT="0" |
| 133 |
|
| 134 |
diff --git a/sci-biology/psychopy/psychopy-9999.ebuild b/sci-biology/psychopy/psychopy-9999.ebuild |
| 135 |
index f2a2c00..f463a57 100644 |
| 136 |
--- a/sci-biology/psychopy/psychopy-9999.ebuild |
| 137 |
+++ b/sci-biology/psychopy/psychopy-9999.ebuild |
| 138 |
@@ -1,8 +1,8 @@ |
| 139 |
-# Copyright 1999-2015 Gentoo Foundation |
| 140 |
+# Copyright 1999-2016 Gentoo Foundation |
| 141 |
# Distributed under the terms of the GNU General Public License v2 |
| 142 |
# $Id$ |
| 143 |
|
| 144 |
-EAPI="5" |
| 145 |
+EAPI="6" |
| 146 |
|
| 147 |
PYTHON_COMPAT=( python2_7 ) |
Archives