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

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

[Kacper Kowalik]

commit:     29a26f5fdc657e92707210f9e6cf5cb8889c3c00
Author:     Horea Christian <h.chr <AT> mail <DOT> ru>
AuthorDate: Fri Aug 30 04:20:22 2013 +0000
Commit:     Kacper Kowalik <xarthisius <AT> gentoo <DOT> org>
CommitDate: Fri Aug 30 04:20:22 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=29a26f5f

Removed keywords

---
 sci-biology/psychopy/psychopy-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-biology/psychopy/psychopy-9999.ebuild b/sci-biology/psychopy/psychopy-9999.ebuild
index cc02416..f6100a2 100644
--- a/sci-biology/psychopy/psychopy-9999.ebuild
+++ b/sci-biology/psychopy/psychopy-9999.ebuild
@@ -14,7 +14,7 @@ EGIT_REPO_URI="https://github.com/psychopy/psychopy.git"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 

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

[Horea Christian]

commit:     0a629c3612b4f2012de93a4d32f839b2424b7adb
Author:     Horea Christian <chr <AT> chymera <DOT> eu>
AuthorDate: Sun Sep 27 10:24:53 2020 +0000
Commit:     Horea Christian <horea.christ <AT> gmail <DOT> com>
CommitDate: Sun Sep 27 10:24:53 2020 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=0a629c36

sci-biology/psychopy: removed package with missing dep

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Horea Christian <chr <AT> chymera.eu>

 sci-biology/psychopy/metadata.xml           | 11 -------
 sci-biology/psychopy/psychopy-1.84.2.ebuild | 49 -----------------------------
 2 files changed, 60 deletions(-)

diff --git a/sci-biology/psychopy/metadata.xml b/sci-biology/psychopy/metadata.xml
deleted file mode 100644
index 2c3fbd8bb..000000000
--- a/sci-biology/psychopy/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>horea.christ@gmail.com</email>
-		<name>Horea Christian</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">psychopy/psychopy</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/sci-biology/psychopy/psychopy-1.84.2.ebuild b/sci-biology/psychopy/psychopy-1.84.2.ebuild
deleted file mode 100644
index c19d8ecd8..000000000
--- a/sci-biology/psychopy/psychopy-1.84.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,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/configobj[${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/pillow[${PYTHON_USEDEP}]
-	dev-python/pygame[${PYTHON_USEDEP}]
-	dev-python/pyglet[${PYTHON_USEDEP}]
-	dev-python/pyopengl[${PYTHON_USEDEP}]
-	dev-python/wxpython:*[${PYTHON_USEDEP}]
-	media-libs/avbin-bin
-	media-libs/opencv[python,${PYTHON_USEDEP}]
-	dev-python/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
-}

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

[Horea Christian]

commit:     31dbb1cf4a73359a6301f8fba32ca84c64377f5e
Author:     Horea Christian <chr <AT> chymera <DOT> eu>
AuthorDate: Sat Sep 26 09:56:37 2020 +0000
Commit:     Horea Christian <horea.christ <AT> gmail <DOT> com>
CommitDate: Sat Sep 26 09:56:37 2020 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=31dbb1cf

sci-biology/psychopy: rm old and live versions, PYTHON_COMPAT update

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Horea Christian <chr <AT> chymera.eu>

 sci-biology/psychopy/psychopy-1.84.0.ebuild | 49 ----------------------------
 sci-biology/psychopy/psychopy-1.84.1.ebuild | 49 ----------------------------
 sci-biology/psychopy/psychopy-1.84.2.ebuild |  6 ++--
 sci-biology/psychopy/psychopy-9999.ebuild   | 50 -----------------------------
 4 files changed, 3 insertions(+), 151 deletions(-)

diff --git a/sci-biology/psychopy/psychopy-1.84.0.ebuild b/sci-biology/psychopy/psychopy-1.84.0.ebuild
deleted file mode 100644
index f6cddd102..000000000
--- a/sci-biology/psychopy/psychopy-1.84.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	"
-RDEPEND="
-	dev-python/configobj[${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/pillow[${PYTHON_USEDEP}]
-	dev-python/pygame[${PYTHON_USEDEP}]
-	dev-python/pyglet[${PYTHON_USEDEP}]
-	dev-python/pyopengl[${PYTHON_USEDEP}]
-	dev-python/wxpython:*[${PYTHON_USEDEP}]
-	media-libs/avbin-bin
-	media-libs/opencv[python,${PYTHON_USEDEP}]
-	dev-python/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.1.ebuild b/sci-biology/psychopy/psychopy-1.84.1.ebuild
deleted file mode 100644
index c8ba3359e..000000000
--- a/sci-biology/psychopy/psychopy-1.84.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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/configobj[${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/pillow[${PYTHON_USEDEP}]
-	dev-python/pygame[${PYTHON_USEDEP}]
-	dev-python/pyglet[${PYTHON_USEDEP}]
-	dev-python/pyopengl[${PYTHON_USEDEP}]
-	dev-python/wxpython:*[${PYTHON_USEDEP}]
-	media-libs/avbin-bin
-	media-libs/opencv[python,${PYTHON_USEDEP}]
-	dev-python/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.2.ebuild b/sci-biology/psychopy/psychopy-1.84.2.ebuild
index c8ba3359e..c19d8ecd8 100644
--- a/sci-biology/psychopy/psychopy-1.84.2.ebuild
+++ b/sci-biology/psychopy/psychopy-1.84.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit eutils gnome2-utils distutils-r1

diff --git a/sci-biology/psychopy/psychopy-9999.ebuild b/sci-biology/psychopy/psychopy-9999.ebuild
deleted file mode 100644
index 751f7f870..000000000
--- a/sci-biology/psychopy/psychopy-9999.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit eutils gnome2-utils distutils-r1 git-r3
-
-DESCRIPTION="Python experimental psychology toolkit"
-HOMEPAGE="http://www.psychopy.org/"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/psychopy/psychopy.git"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS=""
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	"
-RDEPEND="
-	dev-python/configobj[${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/pillow[${PYTHON_USEDEP}]
-	dev-python/pygame[${PYTHON_USEDEP}]
-	dev-python/pyglet[${PYTHON_USEDEP}]
-	dev-python/pyopengl[${PYTHON_USEDEP}]
-	dev-python/wxpython:*[${PYTHON_USEDEP}]
-	media-libs/avbin-bin
-	media-libs/opencv[python,${PYTHON_USEDEP}]
-	dev-python/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
-}

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

[Christoph Junghans]

commit:     e8988a6e7feeecbc37b48daf19e6f5c868483c37
Author:     Horea Christian <horea.christ <AT> yandex <DOT> com>
AuthorDate: Sat Dec  3 12:27:44 2016 +0000
Commit:     Christoph Junghans <junghans <AT> gentoo <DOT> org>
CommitDate: Sat Dec  3 12:27:44 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=e8988a6e

sci-biology/psychopy: version bump (#706)

Package-Manager: portage-2.3.2

 sci-biology/psychopy/psychopy-1.84.2.ebuild | 50 +++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/sci-biology/psychopy/psychopy-1.84.2.ebuild b/sci-biology/psychopy/psychopy-1.84.2.ebuild
new file mode 100644
index 0000000..b15e00d
--- /dev/null
+++ b/sci-biology/psychopy/psychopy-1.84.2.ebuild
@@ -0,0 +1,50 @@
+# 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/configobj[${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/pillow[${PYTHON_USEDEP}]
+	dev-python/pygame[${PYTHON_USEDEP}]
+	dev-python/pyglet[${PYTHON_USEDEP}]
+	dev-python/pyopengl[${PYTHON_USEDEP}]
+	dev-python/wxpython:*[${PYTHON_USEDEP}]
+	media-libs/avbin-bin
+	media-libs/opencv[python,${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
+}

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

[Justin Lecher]

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}]
 	"
 

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

[Marius Brehler]

commit:     cdd744455e778ec89e84b8395522e21eaae83582
Author:     Horea Christian <horea.christ <AT> yandex <DOT> com>
AuthorDate: Mon Sep 26 11:04:05 2016 +0000
Commit:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
CommitDate: Mon Sep 26 11:04:05 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=cdd74445

sci-biology/psychopy: version bump (#685)

Package-Manager: portage-2.3.1

 sci-biology/psychopy/psychopy-1.84.1.ebuild | 50 +++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/sci-biology/psychopy/psychopy-1.84.1.ebuild b/sci-biology/psychopy/psychopy-1.84.1.ebuild
new file mode 100644
index 0000000..7260f62
--- /dev/null
+++ b/sci-biology/psychopy/psychopy-1.84.1.ebuild
@@ -0,0 +1,50 @@
+# 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/configobj[${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/pillow[${PYTHON_USEDEP}]
+	dev-python/pygame[${PYTHON_USEDEP}]
+	dev-python/pyglet[${PYTHON_USEDEP}]
+	dev-python/pyopengl[${PYTHON_USEDEP}]
+	dev-python/wxpython:*[${PYTHON_USEDEP}]
+	media-libs/avbin-bin
+	media-libs/opencv[python,python_single_target_python2_7]
+	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
+}

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

[Marius Brehler]

commit:     7c59bc8c709d3c410f76b1970d1ad4d5aa217d76
Author:     Horea Christian <horea.christ <AT> yandex <DOT> com>
AuthorDate: Tue Sep  6 12:55:42 2016 +0000
Commit:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
CommitDate: Tue Sep  6 12:55:42 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=7c59bc8c

sci-biology/psychopy: added deps for video rendering (#660)

* sci-biology/psychopy: added opencv dep for video rendering

Package-Manager: portage-2.3.0

* sci-biology/psychopy: opencv does weird things when built with PYTHON_USEDEP

Package-Manager: portage-2.3.0

* sci-biology/psychopy: typo

Package-Manager: portage-2.3.0

* sci-biology/psychopy: psychopy requires threads

Package-Manager: portage-2.3.0

* sci-biology/psychopy: added dependency

Package-Manager: portage-2.3.0

 sci-biology/psychopy/psychopy-1.78.00.ebuild | 1 +
 sci-biology/psychopy/psychopy-1.83.03.ebuild | 2 ++
 sci-biology/psychopy/psychopy-1.84.0.ebuild  | 3 +++
 sci-biology/psychopy/psychopy-9999.ebuild    | 9 +++++++--
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/sci-biology/psychopy/psychopy-1.78.00.ebuild b/sci-biology/psychopy/psychopy-1.78.00.ebuild
index cd50a85..c55c9b2 100644
--- a/sci-biology/psychopy/psychopy-1.78.00.ebuild
+++ b/sci-biology/psychopy/psychopy-1.78.00.ebuild
@@ -5,6 +5,7 @@
 EAPI="6"
 
 PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads(+)"
 
 inherit eutils gnome2-utils distutils-r1
 

diff --git a/sci-biology/psychopy/psychopy-1.83.03.ebuild b/sci-biology/psychopy/psychopy-1.83.03.ebuild
index cd50a85..47021b4 100644
--- a/sci-biology/psychopy/psychopy-1.83.03.ebuild
+++ b/sci-biology/psychopy/psychopy-1.83.03.ebuild
@@ -5,6 +5,7 @@
 EAPI="6"
 
 PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads(+)"
 
 inherit eutils gnome2-utils distutils-r1
 
@@ -22,6 +23,7 @@ DEPEND="
 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}]

diff --git a/sci-biology/psychopy/psychopy-1.84.0.ebuild b/sci-biology/psychopy/psychopy-1.84.0.ebuild
index 2fccb4d..4dc03e7 100644
--- a/sci-biology/psychopy/psychopy-1.84.0.ebuild
+++ b/sci-biology/psychopy/psychopy-1.84.0.ebuild
@@ -5,6 +5,7 @@
 EAPI="6"
 
 PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads(+)"
 
 inherit eutils gnome2-utils distutils-r1
 
@@ -23,6 +24,7 @@ RDEPEND="
 	dev-python/configobj[${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/pillow[${PYTHON_USEDEP}]
 	dev-python/pygame[${PYTHON_USEDEP}]
@@ -30,6 +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]
 	sci-libs/scipy[${PYTHON_USEDEP}]
 	"
 

diff --git a/sci-biology/psychopy/psychopy-9999.ebuild b/sci-biology/psychopy/psychopy-9999.ebuild
index f463a57..d47914b 100644
--- a/sci-biology/psychopy/psychopy-9999.ebuild
+++ b/sci-biology/psychopy/psychopy-9999.ebuild
@@ -5,6 +5,7 @@
 EAPI="6"
 
 PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads(+)"
 
 inherit eutils gnome2-utils distutils-r1 git-r3
 
@@ -20,15 +21,19 @@ KEYWORDS=""
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	"
-RDEPEND="${DEPEND}
-	dev-python/pillow[${PYTHON_USEDEP}]
+RDEPEND="
+	dev-python/configobj[${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/pillow[${PYTHON_USEDEP}]
 	dev-python/pygame[${PYTHON_USEDEP}]
 	dev-python/pyglet[${PYTHON_USEDEP}]
 	dev-python/pyopengl[${PYTHON_USEDEP}]
 	dev-python/wxpython:*[${PYTHON_USEDEP}]
+	media-libs/avbin-bin
+	media-libs/opencv[python,python_single_target_python2_7]
 	sci-libs/scipy[${PYTHON_USEDEP}]
 	"
 

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

[Justin Lecher]

commit:     d6223dff32cc9ff080b9369545ffbbe1cd75333c
Author:     Horea Christian <horea.christ <AT> yandex <DOT> com>
AuthorDate: Tue Aug 23 20:14:51 2016 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Aug 23 20:14:51 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=d6223dff

Psychopy - version bump (#659)

* sci-biology/psychopy: vresion bump

Package-Manager: portage-2.3.0

* sci-biology/psychopy: rordered deps

Package-Manager: portage-2.3.0

* sci-biology/psychopy: added dep

Package-Manager: portage-2.3.0

 sci-biology/psychopy/psychopy-1.84.0.ebuild | 47 +++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/sci-biology/psychopy/psychopy-1.84.0.ebuild b/sci-biology/psychopy/psychopy-1.84.0.ebuild
new file mode 100644
index 0000000..2fccb4d
--- /dev/null
+++ b/sci-biology/psychopy/psychopy-1.84.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils gnome2-utils distutils-r1
+
+DESCRIPTION="Python experimental psychology toolkit"
+HOMEPAGE="http://www.psychopy.org/"
+SRC_URI="https://github.com/psychopy/psychopy/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	"
+RDEPEND="
+	dev-python/configobj[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/numpy[lapack,${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pygame[${PYTHON_USEDEP}]
+	dev-python/pyglet[${PYTHON_USEDEP}]
+	dev-python/pyopengl[${PYTHON_USEDEP}]
+	dev-python/wxpython:*[${PYTHON_USEDEP}]
+	media-libs/avbin-bin
+	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
+}

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

[Justin Lecher]

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 )
 

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

[Justin Lecher]

commit:     94fc331bfd31b4bc315cbefbc65e9baffecd98d5
Author:     Horea Christian <h.chr <AT> mail <DOT> ru>
AuthorDate: Mon Jan 18 12:59:15 2016 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Jan 18 12:59:15 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=94fc331b

sci-biology/psychopy: fixed copyright

Package-Manager: portage-2.2.26

 sci-biology/psychopy/psychopy-1.83.03.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-biology/psychopy/psychopy-1.83.03.ebuild b/sci-biology/psychopy/psychopy-1.83.03.ebuild
index 072728f..d89a377 100644
--- a/sci-biology/psychopy/psychopy-1.83.03.ebuild
+++ b/sci-biology/psychopy/psychopy-1.83.03.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 

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

[Justin Lecher]

commit:     40538baa57871ca325a0f077ba4d110cc3060491
Author:     Horea Christian <h.chr <AT> mail <DOT> ru>
AuthorDate: Mon Jan 18 12:33:06 2016 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Jan 18 12:33:06 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=40538baa

sci-biology/psychopy: version bump

Package-Manager: portage-2.2.26

 sci-biology/psychopy/psychopy-1.83.03.ebuild | 47 ++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/sci-biology/psychopy/psychopy-1.83.03.ebuild b/sci-biology/psychopy/psychopy-1.83.03.ebuild
new file mode 100644
index 0000000..b773ea5
--- /dev/null
+++ b/sci-biology/psychopy/psychopy-1.83.03.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils gnome2-utils distutils-r1 git-r3
+
+DESCRIPTION="Python experimental psychology toolkit"
+HOMEPAGE="http://www.psychopy.org/"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/psychopy/psychopy.git"
+EGIT_COMMIT="1.83.03x"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS=""
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	"
+RDEPEND="${DEPEND}
+	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
+}

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

[Justin Lecher]

commit:     927154ffad14a313a0817dfe2793f927ca12d55f
Author:     Horea Christian <h.chr <AT> mail <DOT> ru>
AuthorDate: Mon Jan 18 14:50:24 2016 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Jan 18 14:50:24 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=927154ff

sci-biology/psychopy: updated source link

Package-Manager: portage-2.2.26

 sci-biology/psychopy/psychopy-1.83.03.ebuild | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/sci-biology/psychopy/psychopy-1.83.03.ebuild b/sci-biology/psychopy/psychopy-1.83.03.ebuild
index 03da25c..c22a368 100644
--- a/sci-biology/psychopy/psychopy-1.83.03.ebuild
+++ b/sci-biology/psychopy/psychopy-1.83.03.ebuild
@@ -6,13 +6,11 @@ EAPI="5"
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit eutils gnome2-utils distutils-r1 git-r3
+inherit eutils gnome2-utils distutils-r1
 
 DESCRIPTION="Python experimental psychology toolkit"
 HOMEPAGE="http://www.psychopy.org/"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/psychopy/psychopy.git"
-EGIT_COMMIT="1.83.03"
+SRC_URI="https://github.com/psychopy/psychopy/releases/download/${PV}/${P}.zip"
 
 LICENSE="GPL-3+"
 SLOT="0"

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

[Justin Lecher]

commit:     b5774c6f665f848a3a2a78366c384b24532782fb
Author:     Horea Christian <h.chr <AT> mail <DOT> ru>
AuthorDate: Mon Jan 18 12:57:50 2016 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Jan 18 12:57:50 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=b5774c6f

sci-biology/psychopy: corrected tag name, added keywords

Package-Manager: portage-2.2.26

 sci-biology/psychopy/psychopy-1.83.03.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-biology/psychopy/psychopy-1.83.03.ebuild b/sci-biology/psychopy/psychopy-1.83.03.ebuild
index b773ea5..072728f 100644
--- a/sci-biology/psychopy/psychopy-1.83.03.ebuild
+++ b/sci-biology/psychopy/psychopy-1.83.03.ebuild
@@ -12,11 +12,11 @@ DESCRIPTION="Python experimental psychology toolkit"
 HOMEPAGE="http://www.psychopy.org/"
 SRC_URI=""
 EGIT_REPO_URI="https://github.com/psychopy/psychopy.git"
-EGIT_COMMIT="1.83.03x"
+EGIT_COMMIT="1.83.03"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]

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

[Justin Lecher]

commit:     c5876d86bc21ebd16142a014713ff8aad1e87465
Author:     Horea Christian <h.chr <AT> mail <DOT> ru>
AuthorDate: Mon Jan 18 13:24:00 2016 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Jan 18 13:24:00 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=c5876d86

sci-biology/psychopy: removed setuptools from runtime deps

Package-Manager: portage-2.2.26

 sci-biology/psychopy/psychopy-1.83.03.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sci-biology/psychopy/psychopy-1.83.03.ebuild b/sci-biology/psychopy/psychopy-1.83.03.ebuild
index d89a377..03da25c 100644
--- a/sci-biology/psychopy/psychopy-1.83.03.ebuild
+++ b/sci-biology/psychopy/psychopy-1.83.03.ebuild
@@ -21,8 +21,7 @@ KEYWORDS="~amd64 ~x86"
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	"
-RDEPEND="${DEPEND}
-	dev-python/pillow[${PYTHON_USEDEP}]
+RDEPEND="dev-python/pillow[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/matplotlib[${PYTHON_USEDEP}]
 	dev-python/numpy[lapack,${PYTHON_USEDEP}]

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

[Justin Lecher]

commit:     c0a5266e63153a605b5b1426140f41487ad70d3d
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  2 10:33:32 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Apr  2 10:33:32 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=c0a5266e

sci-biology/psychopy: Drop eselect dependency

Package-Manager: portage-2.2.18

 sci-biology/psychopy/ChangeLog               | 3 +++
 sci-biology/psychopy/psychopy-1.78.00.ebuild | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/sci-biology/psychopy/ChangeLog b/sci-biology/psychopy/ChangeLog
index 49cc4a4..a180e47 100644
--- a/sci-biology/psychopy/ChangeLog
+++ b/sci-biology/psychopy/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  02 Apr 2015; Justin Lecher <jlec@gentoo.org> psychopy-1.78.00.ebuild:
+  sci-biology/psychopy: Drop eselect dependency
+
   18 Feb 2015; Justin Lecher <jlec@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

diff --git a/sci-biology/psychopy/psychopy-1.78.00.ebuild b/sci-biology/psychopy/psychopy-1.78.00.ebuild
index 864a1d3..8de257b 100644
--- a/sci-biology/psychopy/psychopy-1.78.00.ebuild
+++ b/sci-biology/psychopy/psychopy-1.78.00.ebuild
@@ -32,7 +32,7 @@ RDEPEND="
 	dev-python/pygame[${PYTHON_USEDEP}]
 	"
 
-DEPEND="app-admin/eselect
+DEPEND="
 	app-arch/unzip
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( ${RDEPEND} )

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

[Justin Lecher]

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 <jlec@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 <jlec@gentoo.org> psychopy-9999.ebuild:
   Switch from git-2 to git-r3
 
   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/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}]
 	"
 

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

[Justin Lecher]

commit:     529d752d633bdc69a03a87e287b96acc8e4000be
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  6 18:57:34 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Jan  6 18:57:34 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=529d752d

sci-biology/psychopy: Switch from git-2 to git-r3

Package-Manager: portage-2.2.8

---
 sci-biology/psychopy/ChangeLog            |  5 ++++-
 sci-biology/psychopy/psychopy-9999.ebuild | 10 +++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/sci-biology/psychopy/ChangeLog b/sci-biology/psychopy/ChangeLog
index 67c7acd..a96dfee 100644
--- a/sci-biology/psychopy/ChangeLog
+++ b/sci-biology/psychopy/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for sci-biology/psychopy
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  06 Jan 2014; Justin Lecher <jlec@gentoo.org> psychopy-9999.ebuild:
+  Switch from git-2 to git-r3
+
   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/psychopy-9999.ebuild b/sci-biology/psychopy/psychopy-9999.ebuild
index 512d347..cb8f2fe 100644
--- a/sci-biology/psychopy/psychopy-9999.ebuild
+++ b/sci-biology/psychopy/psychopy-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -6,20 +6,20 @@ EAPI="5"
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit eutils gnome2-utils distutils-r1 git-2
+inherit eutils gnome2-utils distutils-r1 git-r3
 
 DESCRIPTION="Python experimental psychology toolkit"
 HOMEPAGE="http://www.psychopy.org/"
+SRC_URI=""
 EGIT_REPO_URI="https://github.com/psychopy/psychopy.git"
 
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS=""
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	app-admin/eselect
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	"
-
 RDEPEND="${DEPEND}
 	virtual/python-imaging[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]

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

[Kacper Kowalik]

commit:     f2073f66ad58dd1f42e07ac36e0e5edbcbc41ebd
Author:     Horea Christian <h.chr <AT> mail <DOT> ru>
AuthorDate: Tue Sep  3 22:43:25 2013 +0000
Commit:     Kacper Kowalik <xarthisius <AT> gentoo <DOT> org>
CommitDate: Tue Sep  3 22:43:25 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f2073f66

Listed app-admin/eselect under DEP only (instead of RDEP)

---
 sci-biology/psychopy/psychopy-1.75.01.ebuild | 10 ++++++----
 sci-biology/psychopy/psychopy-1.77.02.ebuild | 10 ++++++----
 sci-biology/psychopy/psychopy-1.78.00.ebuild | 10 ++++++----
 sci-biology/psychopy/psychopy-9999.ebuild    |  8 +++++---
 4 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/sci-biology/psychopy/psychopy-1.75.01.ebuild b/sci-biology/psychopy/psychopy-1.75.01.ebuild
index ceeac91..db7ffd3 100644
--- a/sci-biology/psychopy/psychopy-1.75.01.ebuild
+++ b/sci-biology/psychopy/psychopy-1.75.01.ebuild
@@ -28,13 +28,15 @@ RDEPEND="
 	dev-python/wxpython[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
-	app-admin/eselect
 	dev-python/pyglet[${PYTHON_USEDEP}]
-	dev-python/pygame[${PYTHON_USEDEP}]"
+	dev-python/pygame[${PYTHON_USEDEP}]
+	"
 
-DEPEND="app-arch/unzip
+DEPEND="app-admin/eselect
+	app-arch/unzip
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND} )"
+	test? ( ${RDEPEND} )
+	"
 
 RESTRICT="test" # interactive, opens lots of windows
 

diff --git a/sci-biology/psychopy/psychopy-1.77.02.ebuild b/sci-biology/psychopy/psychopy-1.77.02.ebuild
index ceeac91..db7ffd3 100644
--- a/sci-biology/psychopy/psychopy-1.77.02.ebuild
+++ b/sci-biology/psychopy/psychopy-1.77.02.ebuild
@@ -28,13 +28,15 @@ RDEPEND="
 	dev-python/wxpython[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
-	app-admin/eselect
 	dev-python/pyglet[${PYTHON_USEDEP}]
-	dev-python/pygame[${PYTHON_USEDEP}]"
+	dev-python/pygame[${PYTHON_USEDEP}]
+	"
 
-DEPEND="app-arch/unzip
+DEPEND="app-admin/eselect
+	app-arch/unzip
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND} )"
+	test? ( ${RDEPEND} )
+	"
 
 RESTRICT="test" # interactive, opens lots of windows
 

diff --git a/sci-biology/psychopy/psychopy-1.78.00.ebuild b/sci-biology/psychopy/psychopy-1.78.00.ebuild
index 32e1751..584a533 100644
--- a/sci-biology/psychopy/psychopy-1.78.00.ebuild
+++ b/sci-biology/psychopy/psychopy-1.78.00.ebuild
@@ -28,13 +28,15 @@ RDEPEND="
 	dev-python/wxpython[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
-	app-admin/eselect
 	dev-python/pyglet[${PYTHON_USEDEP}]
-	dev-python/pygame[${PYTHON_USEDEP}]"
+	dev-python/pygame[${PYTHON_USEDEP}]
+	"
 
-DEPEND="app-arch/unzip
+DEPEND="app-admin/eselect
+	app-arch/unzip
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND} )"
+	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 3cb8e83..512d347 100644
--- a/sci-biology/psychopy/psychopy-9999.ebuild
+++ b/sci-biology/psychopy/psychopy-9999.ebuild
@@ -16,10 +16,11 @@ LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS=""
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	app-admin/eselect
+	"
 
 RDEPEND="${DEPEND}
-	app-admin/eselect
 	virtual/python-imaging[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/matplotlib[${PYTHON_USEDEP}]
@@ -28,7 +29,8 @@ RDEPEND="${DEPEND}
 	dev-python/pyglet[${PYTHON_USEDEP}]
 	dev-python/pyopengl[${PYTHON_USEDEP}]
 	dev-python/wxpython[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]"
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	"
 
 python_install_all() {
 	distutils-r1_python_install_all

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

[Kacper Kowalik]

commit:     542eb0fc75cfc4eb279fa3672d1a326515089e2a
Author:     Horea Christian <h.chr <AT> mail <DOT> ru>
AuthorDate: Tue Sep  3 22:39:17 2013 +0000
Commit:     Kacper Kowalik <xarthisius <AT> gentoo <DOT> org>
CommitDate: Tue Sep  3 22:39:17 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=542eb0fc

Deleted "Science;Biology" specification for desktoop entries.

---
 sci-biology/psychopy/psychopy-1.75.01.ebuild | 2 +-
 sci-biology/psychopy/psychopy-1.77.02.ebuild | 2 +-
 sci-biology/psychopy/psychopy-1.78.00.ebuild | 2 +-
 sci-biology/psychopy/psychopy-9999.ebuild    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-biology/psychopy/psychopy-1.75.01.ebuild b/sci-biology/psychopy/psychopy-1.75.01.ebuild
index f4469ce..ceeac91 100644
--- a/sci-biology/psychopy/psychopy-1.75.01.ebuild
+++ b/sci-biology/psychopy/psychopy-1.75.01.ebuild
@@ -43,7 +43,7 @@ S="${WORKDIR}/${MY_P}"
 python_install_all() {
 	distutils-r1_python_install_all
 	doicon psychopy/monitors/psychopy.ico
-	make_desktop_entry psychopyapp.py PsychoPy psychopy "Science;Biology"
+	make_desktop_entry psychopyapp.py PsychoPy psychopy
 }
 
 pkg_postinst() {

diff --git a/sci-biology/psychopy/psychopy-1.77.02.ebuild b/sci-biology/psychopy/psychopy-1.77.02.ebuild
index f4469ce..ceeac91 100644
--- a/sci-biology/psychopy/psychopy-1.77.02.ebuild
+++ b/sci-biology/psychopy/psychopy-1.77.02.ebuild
@@ -43,7 +43,7 @@ S="${WORKDIR}/${MY_P}"
 python_install_all() {
 	distutils-r1_python_install_all
 	doicon psychopy/monitors/psychopy.ico
-	make_desktop_entry psychopyapp.py PsychoPy psychopy "Science;Biology"
+	make_desktop_entry psychopyapp.py PsychoPy psychopy
 }
 
 pkg_postinst() {

diff --git a/sci-biology/psychopy/psychopy-1.78.00.ebuild b/sci-biology/psychopy/psychopy-1.78.00.ebuild
index 22452dc..32e1751 100644
--- a/sci-biology/psychopy/psychopy-1.78.00.ebuild
+++ b/sci-biology/psychopy/psychopy-1.78.00.ebuild
@@ -43,7 +43,7 @@ S="${WORKDIR}/${MY_P}"
 python_install_all() {
 	distutils-r1_python_install_all
 	doicon psychopy/monitors/psychopy.ico
-	make_desktop_entry psychopyapp.py PsychoPy psychopy "Science;Biology"
+	make_desktop_entry psychopyapp.py PsychoPy psychopy
 }
 
 pkg_postinst() {

diff --git a/sci-biology/psychopy/psychopy-9999.ebuild b/sci-biology/psychopy/psychopy-9999.ebuild
index f6100a2..3cb8e83 100644
--- a/sci-biology/psychopy/psychopy-9999.ebuild
+++ b/sci-biology/psychopy/psychopy-9999.ebuild
@@ -33,7 +33,7 @@ RDEPEND="${DEPEND}
 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 "Science;Biology"
+	make_desktop_entry psychopyApp.py PsychoPy psychopy
 }
 
 pkg_postinst() {

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

[Kacper Kowalik]

commit:     144fc17c1d1d13653e04c40fb6d7071735252f60
Author:     Horea Christian <h.chr <AT> mail <DOT> ru>
AuthorDate: Fri Aug 30 04:21:53 2013 +0000
Commit:     Kacper Kowalik <xarthisius <AT> gentoo <DOT> org>
CommitDate: Fri Aug 30 04:21:53 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=144fc17c

Added keywords.

---
 sci-biology/psychopy/psychopy-1.77.02.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-biology/psychopy/psychopy-1.77.02.ebuild b/sci-biology/psychopy/psychopy-1.77.02.ebuild
index e7d5e6e..f4469ce 100644
--- a/sci-biology/psychopy/psychopy-1.77.02.ebuild
+++ b/sci-biology/psychopy/psychopy-1.77.02.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://psychopy.googlecode.com/files/${MY_P}.zip"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
 RDEPEND="

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

[Kacper Kowalik]

commit:     58a32ef269a82461b185e86356384ec769b42911
Author:     Horea Christian <h.chr <AT> mail <DOT> ru>
AuthorDate: Fri Aug 30 04:20:43 2013 +0000
Commit:     Kacper Kowalik <xarthisius <AT> gentoo <DOT> org>
CommitDate: Fri Aug 30 04:20:43 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=58a32ef2

Re-added keywords

---
 sci-biology/psychopy/psychopy-1.75.01.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-biology/psychopy/psychopy-1.75.01.ebuild b/sci-biology/psychopy/psychopy-1.75.01.ebuild
index e7d5e6e..f4469ce 100644
--- a/sci-biology/psychopy/psychopy-1.75.01.ebuild
+++ b/sci-biology/psychopy/psychopy-1.75.01.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://psychopy.googlecode.com/files/${MY_P}.zip"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
 RDEPEND="

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

[Kacper Kowalik]

commit:     11f8fadb1c5641a8ee67f8315b05d1fea3a17f6e
Author:     Horea Christian <h.chr <AT> mail <DOT> ru>
AuthorDate: Fri Aug 30 04:13:29 2013 +0000
Commit:     Kacper Kowalik <xarthisius <AT> gentoo <DOT> org>
CommitDate: Fri Aug 30 04:13:29 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=11f8fadb

New, updated Psychopy ebuilds
(1.77.02 and 1.78.00)

---
 sci-biology/psychopy/psychopy-1.75.01.ebuild                            | 2 +-
 .../psychopy/{psychopy-1.75.01.ebuild => psychopy-1.77.02.ebuild}       | 2 +-
 .../psychopy/{psychopy-1.75.01.ebuild => psychopy-1.78.00.ebuild}       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-biology/psychopy/psychopy-1.75.01.ebuild b/sci-biology/psychopy/psychopy-1.75.01.ebuild
index f4469ce..e7d5e6e 100644
--- a/sci-biology/psychopy/psychopy-1.75.01.ebuild
+++ b/sci-biology/psychopy/psychopy-1.75.01.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://psychopy.googlecode.com/files/${MY_P}.zip"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 IUSE="test"
 
 RDEPEND="

diff --git a/sci-biology/psychopy/psychopy-1.75.01.ebuild b/sci-biology/psychopy/psychopy-1.77.02.ebuild
similarity index 98%
copy from sci-biology/psychopy/psychopy-1.75.01.ebuild
copy to sci-biology/psychopy/psychopy-1.77.02.ebuild
index f4469ce..e7d5e6e 100644
--- a/sci-biology/psychopy/psychopy-1.75.01.ebuild
+++ b/sci-biology/psychopy/psychopy-1.77.02.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://psychopy.googlecode.com/files/${MY_P}.zip"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 IUSE="test"
 
 RDEPEND="

diff --git a/sci-biology/psychopy/psychopy-1.75.01.ebuild b/sci-biology/psychopy/psychopy-1.78.00.ebuild
similarity index 94%
copy from sci-biology/psychopy/psychopy-1.75.01.ebuild
copy to sci-biology/psychopy/psychopy-1.78.00.ebuild
index f4469ce..22452dc 100644
--- a/sci-biology/psychopy/psychopy-1.75.01.ebuild
+++ b/sci-biology/psychopy/psychopy-1.78.00.ebuild
@@ -12,7 +12,7 @@ MY_P="PsychoPy-${PV}"
 
 DESCRIPTION="Python experimental psychology toolkit"
 HOMEPAGE="http://www.psychopy.org/"
-SRC_URI="http://psychopy.googlecode.com/files/${MY_P}.zip"
+SRC_URI="http://sourceforge.net/projects/psychpy/files/PsychoPy/${MY_P}.zip"
 
 LICENSE="GPL-3+"
 SLOT="0"

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

[Justin Lecher]

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

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

[Justin Lecher]

commit:     98099f2c1063e798597ab1f13af139dab9d16926
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:03:27 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=98099f2c

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

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

[Kacper Kowalik]

commit:     af8619116694d7a5bcfd27620547dc3b7d909aad
Author:     Kacper Kowalik (Xarthisius) <xarthisius <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 28 17:48:44 2013 +0000
Commit:     Kacper Kowalik <xarthisius <AT> gentoo <DOT> org>
CommitDate: Mon Jan 28 17:48:44 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=af861911

[sci-biology/psychopy] fix typo in inherit, add metadata, make repoman happy

---
 sci-biology/psychopy/metadata.xml            |    8 +++++++
 sci-biology/psychopy/psychopy-1.75.01.ebuild |   28 +++++++++++++-------------
 sci-biology/psychopy/psychopy-9999.ebuild    |   10 ++++----
 3 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/sci-biology/psychopy/metadata.xml b/sci-biology/psychopy/metadata.xml
new file mode 100644
index 0000000..c791a24
--- /dev/null
+++ b/sci-biology/psychopy/metadata.xml
@@ -0,0 +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>
+</pkgmetadata>

diff --git a/sci-biology/psychopy/psychopy-1.75.01.ebuild b/sci-biology/psychopy/psychopy-1.75.01.ebuild
index 9d6b51d..ee50eb0 100644
--- a/sci-biology/psychopy/psychopy-1.75.01.ebuild
+++ b/sci-biology/psychopy/psychopy-1.75.01.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -23,16 +23,16 @@ KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
 RDEPEND="dev-python/numpy[lapack]
-        sci-libs/scipy
-        dev-python/matplotlib
-        dev-python/pyopengl[${PYTHON_USEDEP}]
-        dev-python/imaging
-        dev-python/wxpython
-        dev-python/setuptools[${PYTHON_USEDEP}]
-        dev-python/lxml[${PYTHON_USEDEP}]
-        app-admin/eselect
-        dev-python/pyglet
-        dev-python/pygame"
+	sci-libs/scipy
+	dev-python/matplotlib
+	dev-python/pyopengl[${PYTHON_USEDEP}]
+	dev-python/imaging
+	dev-python/wxpython
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	app-admin/eselect
+	dev-python/pyglet
+	dev-python/pygame"
 
 DEPEND="app-arch/unzip
 	dev-python/setuptools
@@ -43,9 +43,9 @@ 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 "Science;Biology"
+	distutils-r1_python_install_all
+	doicon psychopy/monitors/psychopy.ico
+	make_desktop_entry psychopyapp.py PsychoPy psychopy "Science;Biology"
 }
 
 pkg_postinst() {

diff --git a/sci-biology/psychopy/psychopy-9999.ebuild b/sci-biology/psychopy/psychopy-9999.ebuild
index 88b3393..7511293 100644
--- a/sci-biology/psychopy/psychopy-9999.ebuild
+++ b/sci-biology/psychopy/psychopy-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
 
-inherit eutils gnome2-eutils distutils-r1 git-2
+inherit eutils gnome2-utils distutils-r1 git-2
 
 DESCRIPTION="Python experiemntal psychology toolkit"
 HOMEPAGE="http://www.psychopy.org/"
@@ -22,16 +22,16 @@ RDEPEND="${DEPEND}
 	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/matplotlib
 	dev-python/numpy[lapack]
-        dev-python/pygame
+	dev-python/pygame
 	dev-python/pyglet
 	dev-python/pyopengl[${PYTHON_USEDEP}]
 	dev-python/wxpython
 	sci-libs/scipy"
 
 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 "Science;Biology"
+	distutils-r1_python_install_all
+	newicon -s scalable psychopy/monitors/psychopy-icon.svg psychopy.svg
+	make_desktop_entry psychopyApp.py PsychoPy psychopy "Science;Biology"
 }
 
 pkg_postinst() {

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

[Justin Lecher]

commit:     5bf009c3789287402201de27801fe4c281051723
Author:     TheChymera <h.chr <AT> mail <DOT> ru>
AuthorDate: Mon Jan 21 02:17:59 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Jan 21 02:17:59 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=5bf009c3

Added pkg_postinst()
in order  to refresh the timestamp and make the desktop environment regenerate the chace - otherwise the icon doesn't show up appropriately

---
 sci-biology/psychopy/psychopy-1.75.01.ebuild |    4 ++++
 sci-biology/psychopy/psychopy-9999.ebuild    |    8 ++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/sci-biology/psychopy/psychopy-1.75.01.ebuild b/sci-biology/psychopy/psychopy-1.75.01.ebuild
index 83f6287..ae5f474 100644
--- a/sci-biology/psychopy/psychopy-1.75.01.ebuild
+++ b/sci-biology/psychopy/psychopy-1.75.01.ebuild
@@ -47,3 +47,7 @@ src_install() {
         doicon psychopy/monitors/psychopy.ico
         make_desktop_entry psychopyapp.py PsychoPy psychopy "Science;Biology"
 }
+
+pkg_postinst() {
+	touch "${ROOT}/usr/share/icons/hicolor"
+}

diff --git a/sci-biology/psychopy/psychopy-9999.ebuild b/sci-biology/psychopy/psychopy-9999.ebuild
index ff224d9..9e77c93 100644
--- a/sci-biology/psychopy/psychopy-9999.ebuild
+++ b/sci-biology/psychopy/psychopy-9999.ebuild
@@ -30,6 +30,10 @@ RDEPEND="${DEPEND}
 
 src_install() {
         distutils-r1_src_install
-        doicon psychopy/monitors/psychopy.ico
-        make_desktop_entry psychopyapp.py PsychoPy psychopy "Science;Biology"
+        newicon -s scalable psychopy/monitors/psychopy-icon.svg psychopy.svg
+        make_desktop_entry psychopyApp.py PsychoPy psychopy "Science;Biology"
+}
+
+pkg_postinst() {
+	touch "${ROOT}/usr/share/icons/hicolor"
 }

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

[Justin Lecher]

commit:     00ebb8da95fa7ad68e53db499307ca004b01e93a
Author:     TheChymera <h.chr <AT> mail <DOT> ru>
AuthorDate: Fri Jan 18 22:37:20 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Jan 18 22:37:20 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=00ebb8da

Added src_install() script to make a launcher and assign an icon to it.

---
 sci-biology/psychopy/psychopy-1.75.01.ebuild |    9 ++++-----
 sci-biology/psychopy/psychopy-9999.ebuild    |   11 +++++------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/sci-biology/psychopy/psychopy-1.75.01.ebuild b/sci-biology/psychopy/psychopy-1.75.01.ebuild
index f9e02b6..83f6287 100644
--- a/sci-biology/psychopy/psychopy-1.75.01.ebuild
+++ b/sci-biology/psychopy/psychopy-1.75.01.ebuild
@@ -42,9 +42,8 @@ RESTRICT="test" # interactive, opens lots of windows
 
 S="${WORKDIR}/${MY_P}"
 
-python_install() {
-	distutils-r1_python_install
-	#local EPYTHON=python2.7
-	#die $(sh -c 'echo $EPYTHON')
-	fperms +x "$(python_get_sitedir)/psychopy/app/psychopyApp.py" || die "chmod of psychopyApp.py failed"
+src_install() {
+        distutils-r1_src_install
+        doicon psychopy/monitors/psychopy.ico
+        make_desktop_entry psychopyapp.py PsychoPy psychopy "Science;Biology"
 }

diff --git a/sci-biology/psychopy/psychopy-9999.ebuild b/sci-biology/psychopy/psychopy-9999.ebuild
index 03b74d4..ff224d9 100644
--- a/sci-biology/psychopy/psychopy-9999.ebuild
+++ b/sci-biology/psychopy/psychopy-9999.ebuild
@@ -9,7 +9,7 @@ inherit eutils distutils-r1 git-2
 
 DESCRIPTION="Python experiemntal psychology toolkit"
 HOMEPAGE="http://www.psychopy.org/"
-EGIT_REPO_URI="https://github.com/psychopy/psychopy"
+EGIT_REPO_URI="https://github.com/TheChymera/psychopy.git"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -28,9 +28,8 @@ RDEPEND="${DEPEND}
 	dev-python/wxpython
 	sci-libs/scipy"
 
-python_install() {
-	distutils-r1_python_install
-	#local EPYTHON=python2.7
-	#die $(sh -c 'echo $EPYTHON')
-	fperms +x "$(python_get_sitedir)/psychopy/app/psychopyApp.py" || die "chmod of psychopyApp.py failed"
+src_install() {
+        distutils-r1_src_install
+        doicon psychopy/monitors/psychopy.ico
+        make_desktop_entry psychopyapp.py PsychoPy psychopy "Science;Biology"
 }

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

[Justin Lecher]

commit:     92005ccaedefc8e902bd3649916ecb41fb28596c
Author:     TheChymera <h.chr <AT> mail <DOT> ru>
AuthorDate: Fri Jan 25 10:48:41 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Jan 25 10:48:41 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=92005cca

used gnome2-utils.eclass function instead of touch to update cache

---
 sci-biology/psychopy/psychopy-1.75.01.ebuild |    2 +-
 sci-biology/psychopy/psychopy-9999.ebuild    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-biology/psychopy/psychopy-1.75.01.ebuild b/sci-biology/psychopy/psychopy-1.75.01.ebuild
index 181ffc7..35adb64 100644
--- a/sci-biology/psychopy/psychopy-1.75.01.ebuild
+++ b/sci-biology/psychopy/psychopy-1.75.01.ebuild
@@ -49,5 +49,5 @@ python_install_all() {
 }
 
 pkg_postinst() {
-	touch "${ROOT}/usr/share/icons/hicolor"
+	gnome2_icon_cache_update
 }

diff --git a/sci-biology/psychopy/psychopy-9999.ebuild b/sci-biology/psychopy/psychopy-9999.ebuild
index 16bc528..4b4e348 100644
--- a/sci-biology/psychopy/psychopy-9999.ebuild
+++ b/sci-biology/psychopy/psychopy-9999.ebuild
@@ -35,5 +35,5 @@ python_install_all() {
 }
 
 pkg_postinst() {
-	touch "${ROOT}/usr/share/icons/hicolor"
+	gnome2_icon_cache_update
 }

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

[Justin Lecher]

commit:     d2f3790332bbc6cef5dcc4c87ee842825e859fe1
Author:     TheChymera <h.chr <AT> mail <DOT> ru>
AuthorDate: Fri Jan 25 18:00:07 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Jan 25 18:00:07 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d2f37903

Inherited gnome2-utils and called cache update from pkg_postrm as well

---
 sci-biology/psychopy/psychopy-1.75.01.ebuild |    5 ++++-
 sci-biology/psychopy/psychopy-9999.ebuild    |    5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/sci-biology/psychopy/psychopy-1.75.01.ebuild b/sci-biology/psychopy/psychopy-1.75.01.ebuild
index 35adb64..9d6b51d 100644
--- a/sci-biology/psychopy/psychopy-1.75.01.ebuild
+++ b/sci-biology/psychopy/psychopy-1.75.01.ebuild
@@ -10,7 +10,7 @@ SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.* *-jython *-pypy-*"
 DISTUTILS_SRC_TEST="py.test"
 
-inherit distutils-r1 eutils
+inherit distutils-r1 gnome2-utils eutils
 
 MY_P="PsychoPy-${PV}"
 
@@ -51,3 +51,6 @@ python_install_all() {
 pkg_postinst() {
 	gnome2_icon_cache_update
 }
+pkg_postrm() {
+	gnome2_icon_cache_update
+}

diff --git a/sci-biology/psychopy/psychopy-9999.ebuild b/sci-biology/psychopy/psychopy-9999.ebuild
index 4b4e348..88b3393 100644
--- a/sci-biology/psychopy/psychopy-9999.ebuild
+++ b/sci-biology/psychopy/psychopy-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
 
-inherit eutils distutils-r1 git-2
+inherit eutils gnome2-eutils distutils-r1 git-2
 
 DESCRIPTION="Python experiemntal psychology toolkit"
 HOMEPAGE="http://www.psychopy.org/"
@@ -37,3 +37,6 @@ python_install_all() {
 pkg_postinst() {
 	gnome2_icon_cache_update
 }
+pkg_postrm() {
+	gnome2_icon_cache_update
+}

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

[Justin Lecher]

commit:     ccb04bcdcfa98cd1090f4032eba52490bf02fdd7
Author:     TheChymera <h.chr <AT> mail <DOT> ru>
AuthorDate: Mon Jan 21 19:50:26 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Jan 21 19:50:26 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ccb04bcd

replaced src_install with python_install_all

---
 sci-biology/psychopy/psychopy-1.75.01.ebuild |    4 ++--
 sci-biology/psychopy/psychopy-9999.ebuild    |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-biology/psychopy/psychopy-1.75.01.ebuild b/sci-biology/psychopy/psychopy-1.75.01.ebuild
index ae5f474..181ffc7 100644
--- a/sci-biology/psychopy/psychopy-1.75.01.ebuild
+++ b/sci-biology/psychopy/psychopy-1.75.01.ebuild
@@ -42,8 +42,8 @@ RESTRICT="test" # interactive, opens lots of windows
 
 S="${WORKDIR}/${MY_P}"
 
-src_install() {
-        distutils-r1_src_install
+python_install_all() {
+        distutils-r1_python_install_all
         doicon psychopy/monitors/psychopy.ico
         make_desktop_entry psychopyapp.py PsychoPy psychopy "Science;Biology"
 }

diff --git a/sci-biology/psychopy/psychopy-9999.ebuild b/sci-biology/psychopy/psychopy-9999.ebuild
index c66ee33..16bc528 100644
--- a/sci-biology/psychopy/psychopy-9999.ebuild
+++ b/sci-biology/psychopy/psychopy-9999.ebuild
@@ -28,8 +28,8 @@ RDEPEND="${DEPEND}
 	dev-python/wxpython
 	sci-libs/scipy"
 
-src_install() {
-        distutils-r1_src_install
+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 "Science;Biology"
 }

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

[Justin Lecher]

commit:     7a96f989de310d52fe4471109e3c85682e76cc28
Author:     TheChymera <h.chr <AT> mail <DOT> ru>
AuthorDate: Mon Jan 21 02:25:15 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Jan 21 02:25:15 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=7a96f989

Corrected source repository
Had been changed for testing.

---
 sci-biology/psychopy/psychopy-9999.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sci-biology/psychopy/psychopy-9999.ebuild b/sci-biology/psychopy/psychopy-9999.ebuild
index 9e77c93..c66ee33 100644
--- a/sci-biology/psychopy/psychopy-9999.ebuild
+++ b/sci-biology/psychopy/psychopy-9999.ebuild
@@ -9,7 +9,7 @@ inherit eutils distutils-r1 git-2
 
 DESCRIPTION="Python experiemntal psychology toolkit"
 HOMEPAGE="http://www.psychopy.org/"
-EGIT_REPO_URI="https://github.com/TheChymera/psychopy.git"
+EGIT_REPO_URI="https://github.com/psychopy/psychopy.git"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"

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

[Justin Lecher]

commit:     4c2693938db7d328f33e833ae2ac700f201523cc
Author:     TheChymera <h.chr <AT> mail <DOT> ru>
AuthorDate: Fri Jan 18 01:57:32 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Jan 18 01:57:32 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4c269393

Fperms instead of Chmod

---
 sci-biology/psychopy/psychopy-1.75.01.ebuild |    2 +-
 sci-biology/psychopy/psychopy-9999.ebuild    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-biology/psychopy/psychopy-1.75.01.ebuild b/sci-biology/psychopy/psychopy-1.75.01.ebuild
index 992daa7..f9e02b6 100644
--- a/sci-biology/psychopy/psychopy-1.75.01.ebuild
+++ b/sci-biology/psychopy/psychopy-1.75.01.ebuild
@@ -46,5 +46,5 @@ python_install() {
 	distutils-r1_python_install
 	#local EPYTHON=python2.7
 	#die $(sh -c 'echo $EPYTHON')
-	chmod +x "${D}$(python_get_sitedir)/psychopy/app/psychopyApp.py" || die "chmod of psychopyApp.py failed"
+	fperms +x "$(python_get_sitedir)/psychopy/app/psychopyApp.py" || die "chmod of psychopyApp.py failed"
 }

diff --git a/sci-biology/psychopy/psychopy-9999.ebuild b/sci-biology/psychopy/psychopy-9999.ebuild
index fa87df2..03b74d4 100644
--- a/sci-biology/psychopy/psychopy-9999.ebuild
+++ b/sci-biology/psychopy/psychopy-9999.ebuild
@@ -32,5 +32,5 @@ python_install() {
 	distutils-r1_python_install
 	#local EPYTHON=python2.7
 	#die $(sh -c 'echo $EPYTHON')
-	chmod +x "${D}$(python_get_sitedir)/psychopy/app/psychopyApp.py" || die "chmod of psychopyApp.py failed"
+	fperms +x "$(python_get_sitedir)/psychopy/app/psychopyApp.py" || die "chmod of psychopyApp.py failed"
 }

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

[Justin Lecher]

commit:     5d48b5d722297b49ec03952e1e8289d79dd99bb6
Author:     TheChymera <h.chr <AT> mail <DOT> ru>
AuthorDate: Wed Jan 16 22:16:31 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Jan 16 22:16:31 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=5d48b5d7

Executable priviledges for /app/psychopyApp.py
Also generally improved 9999 build (many thanks to prometheanfire from #gentoo-dev-help!)

---
 sci-biology/psychopy/psychopy-9999.ebuild |   33 +++++++++++++++++-----------
 1 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/sci-biology/psychopy/psychopy-9999.ebuild b/sci-biology/psychopy/psychopy-9999.ebuild
index 9165bb5..fa87df2 100644
--- a/sci-biology/psychopy/psychopy-9999.ebuild
+++ b/sci-biology/psychopy/psychopy-9999.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
 
-inherit eutils distutils git-2
+inherit eutils distutils-r1 git-2
 
 DESCRIPTION="Python experiemntal psychology toolkit"
 HOMEPAGE="http://www.psychopy.org/"
@@ -13,17 +14,23 @@ LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="dev-python/numpy[lapack]
-	sci-libs/scipy
-	dev-python/matplotlib
-	dev-python/pyopengl
-	dev-python/imaging
-	dev-python/wxpython
-	dev-python/setuptools
-	dev-python/lxml"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
 RDEPEND="${DEPEND}
 	app-admin/eselect
-	dev-python/pyglet
+	dev-python/imaging
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/matplotlib
+	dev-python/numpy[lapack]
         dev-python/pygame
-        "
+	dev-python/pyglet
+	dev-python/pyopengl[${PYTHON_USEDEP}]
+	dev-python/wxpython
+	sci-libs/scipy"
+
+python_install() {
+	distutils-r1_python_install
+	#local EPYTHON=python2.7
+	#die $(sh -c 'echo $EPYTHON')
+	chmod +x "${D}$(python_get_sitedir)/psychopy/app/psychopyApp.py" || die "chmod of psychopyApp.py failed"
+}

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

[Justin Lecher]

commit:     bed4da031cf15f041d034820d4c83860642f2584
Author:     TheChymera <h.chr <AT> mail <DOT> ru>
AuthorDate: Wed Jan 16 23:02:06 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Jan 16 23:02:06 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=bed4da03

Added run permissions for the package's executable file
Also upgraded to distutils-r1 and made other minor improvements to python-related metadata

---
 sci-biology/psychopy/psychopy-1.75.01.ebuild |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/sci-biology/psychopy/psychopy-1.75.01.ebuild b/sci-biology/psychopy/psychopy-1.75.01.ebuild
index 6b341f5..992daa7 100644
--- a/sci-biology/psychopy/psychopy-1.75.01.ebuild
+++ b/sci-biology/psychopy/psychopy-1.75.01.ebuild
@@ -2,14 +2,15 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
 
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.* *-jython *-pypy-*"
 DISTUTILS_SRC_TEST="py.test"
 
-inherit distutils
+inherit distutils-r1 eutils
 
 MY_P="PsychoPy-${PV}"
 
@@ -24,11 +25,11 @@ IUSE="test"
 RDEPEND="dev-python/numpy[lapack]
         sci-libs/scipy
         dev-python/matplotlib
-        dev-python/pyopengl
+        dev-python/pyopengl[${PYTHON_USEDEP}]
         dev-python/imaging
         dev-python/wxpython
-        dev-python/setuptools
-        dev-python/lxml
+        dev-python/setuptools[${PYTHON_USEDEP}]
+        dev-python/lxml[${PYTHON_USEDEP}]
         app-admin/eselect
         dev-python/pyglet
         dev-python/pygame"
@@ -40,3 +41,10 @@ DEPEND="app-arch/unzip
 RESTRICT="test" # interactive, opens lots of windows
 
 S="${WORKDIR}/${MY_P}"
+
+python_install() {
+	distutils-r1_python_install
+	#local EPYTHON=python2.7
+	#die $(sh -c 'echo $EPYTHON')
+	chmod +x "${D}$(python_get_sitedir)/psychopy/app/psychopyApp.py" || die "chmod of psychopyApp.py failed"
+}

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

[Reinis Danne]

commit:     9c3976660861c84315ae81653bd537037a6e5f64
Author:     TheChymera <h.chr <AT> mail <DOT> ru>
AuthorDate: Tue Oct 30 13:43:41 2012 +0000
Commit:     Reinis Danne <rei4dan <AT> gmail <DOT> com>
CommitDate: Tue Oct 30 13:43:41 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=9c397666

Proper DEPEND list and eclass info

---
 sci-biology/psychopy/psychopy-1.75.01.ebuild |   29 +++++++++++++++++---------
 1 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/sci-biology/psychopy/psychopy-1.75.01.ebuild b/sci-biology/psychopy/psychopy-1.75.01.ebuild
index 574263d..6b341f5 100644
--- a/sci-biology/psychopy/psychopy-1.75.01.ebuild
+++ b/sci-biology/psychopy/psychopy-1.75.01.ebuild
@@ -4,30 +4,39 @@
 
 EAPI="4"
 
-inherit eutils distutils
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython *-pypy-*"
+DISTUTILS_SRC_TEST="py.test"
+
+inherit distutils
+
 MY_P="PsychoPy-${PV}"
 
-DESCRIPTION="Python experiemntal psychology toolkit"
+DESCRIPTION="Python experimental psychology toolkit"
 HOMEPAGE="http://www.psychopy.org/"
-SRC_URI="http://psychopy.googlecode.com/files/{MY_P}.zip"
+SRC_URI="http://psychopy.googlecode.com/files/${MY_P}.zip"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE="test"
 
-DEPEND="app-arch/unzip
-	dev-python/numpy[lapack]
+RDEPEND="dev-python/numpy[lapack]
         sci-libs/scipy
         dev-python/matplotlib
         dev-python/pyopengl
         dev-python/imaging
         dev-python/wxpython
         dev-python/setuptools
-        dev-python/lxml"
-
-RDEPEND="${DEPEND}
+        dev-python/lxml
         app-admin/eselect
         dev-python/pyglet
-        dev-python/pygame
-        "
+        dev-python/pygame"
+
+DEPEND="app-arch/unzip
+	dev-python/setuptools
+	test? ( ${RDEPEND} )"
+
+RESTRICT="test" # interactive, opens lots of windows
 
 S="${WORKDIR}/${MY_P}"

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

[Reinis Danne]

commit:     cc8e32d85fe6eb93c7a8b61de3294095b28d65e3
Author:     TheChymera <h.chr <AT> mail <DOT> ru>
AuthorDate: Tue Oct 30 10:51:15 2012 +0000
Commit:     Reinis Danne <rei4dan <AT> gmail <DOT> com>
CommitDate: Tue Oct 30 10:51:15 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=cc8e32d8

Added MY_P key to SRC_URI path

---
 sci-biology/psychopy/psychopy-1.75.01.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sci-biology/psychopy/psychopy-1.75.01.ebuild b/sci-biology/psychopy/psychopy-1.75.01.ebuild
index 546acd4..574263d 100644
--- a/sci-biology/psychopy/psychopy-1.75.01.ebuild
+++ b/sci-biology/psychopy/psychopy-1.75.01.ebuild
@@ -9,7 +9,7 @@ MY_P="PsychoPy-${PV}"
 
 DESCRIPTION="Python experiemntal psychology toolkit"
 HOMEPAGE="http://www.psychopy.org/"
-SRC_URI="http://psychopy.googlecode.com/files/PsychoPy-1.75.01.zip"
+SRC_URI="http://psychopy.googlecode.com/files/{MY_P}.zip"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"