From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 6757C138A1A for ; Wed, 18 Feb 2015 16:41:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DBF03E0994; Wed, 18 Feb 2015 16:41:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A7BC5E098F for ; Wed, 18 Feb 2015 16:41:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DCEEA3408AE for ; Wed, 18 Feb 2015 16:41:26 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 334D71209C for ; Wed, 18 Feb 2015 16:41:24 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1424266944.d9ef580e2e0d2eb230c7e64d4ac626bab347c8f1.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-biology/psychopy/ X-VCS-Repository: proj/sci X-VCS-Files: sci-biology/psychopy/ChangeLog sci-biology/psychopy/psychopy-1.75.01.ebuild sci-biology/psychopy/psychopy-1.77.02.ebuild sci-biology/psychopy/psychopy-1.78.00.ebuild sci-biology/psychopy/psychopy-9999.ebuild X-VCS-Directories: sci-biology/psychopy/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: d9ef580e2e0d2eb230c7e64d4ac626bab347c8f1 X-VCS-Branch: master Date: Wed, 18 Feb 2015 16:41:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 01c1f0d2-de70-461e-afb0-6bd12ee13c17 X-Archives-Hash: 8d6980aa0e6edfe3784e95b2518b8a2c commit: d9ef580e2e0d2eb230c7e64d4ac626bab347c8f1 Author: Justin Lecher gentoo org> AuthorDate: Wed Feb 18 13:42:24 2015 +0000 Commit: Justin Lecher gentoo 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 -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 psychopy-9999.ebuild: Switch from git-2 to git-r3 10 Jun 2013; Justin Lecher 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}] "