From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 18CA013832E for ; Mon, 25 Jul 2016 18:53:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2DBD6E080A; Mon, 25 Jul 2016 18:53:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AA09DE0914 for ; Mon, 25 Jul 2016 18:52:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DDFAB340BFD for ; Mon, 25 Jul 2016 18:52:57 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B6B6B7CE for ; Mon, 25 Jul 2016 18:52:55 +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: <1469472449.84007c1b3c3a34a4bf8daaf897f31340e4d27e83.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-biology/psychopy/ X-VCS-Repository: proj/sci X-VCS-Files: sci-biology/psychopy/psychopy-1.78.00.ebuild sci-biology/psychopy/psychopy-1.83.03.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: 84007c1b3c3a34a4bf8daaf897f31340e4d27e83 X-VCS-Branch: master Date: Mon, 25 Jul 2016 18:52:55 +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: a8e6af6b-d8c9-4dd1-b1ff-d3a295f9d4b4 X-Archives-Hash: b60cd507218a856e1f44b8a142d43f8f commit: 84007c1b3c3a34a4bf8daaf897f31340e4d27e83 Author: Horea Christian yandex com> AuthorDate: Mon Jul 25 18:47:29 2016 +0000 Commit: Justin Lecher gentoo 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 )