From 5d48b5d722297b49ec03952e1e8289d79dd99bb6 Mon Sep 17 00:00:00 2001 From: TheChymera Date: Wed, 16 Jan 2013 22:16:31 +0000 Subject: 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 file changed, 20 insertions(+), 13 deletions(-) diff --git a/sci-biology/psychopy/psychopy-9999.ebuild b/sci-biology/psychopy/psychopy-9999.ebuild index 9165bb54f..fa87df2ef 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" +} -- cgit v1.2.3-65-gdbad From bed4da031cf15f041d034820d4c83860642f2584 Mon Sep 17 00:00:00 2001 From: TheChymera Date: Wed, 16 Jan 2013 23:02:06 +0000 Subject: 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 file 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 6b341f50b..992daa706 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" +} -- cgit v1.2.3-65-gdbad From 4c2693938db7d328f33e833ae2ac700f201523cc Mon Sep 17 00:00:00 2001 From: TheChymera Date: Fri, 18 Jan 2013 01:57:32 +0000 Subject: 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 992daa706..f9e02b6a0 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 fa87df2ef..03b74d457 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" } -- cgit v1.2.3-65-gdbad From 00ebb8da95fa7ad68e53db499307ca004b01e93a Mon Sep 17 00:00:00 2001 From: TheChymera Date: Fri, 18 Jan 2013 22:37:20 +0000 Subject: 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 f9e02b6a0..83f628756 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 03b74d457..ff224d97a 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" } -- cgit v1.2.3-65-gdbad From 5bf009c3789287402201de27801fe4c281051723 Mon Sep 17 00:00:00 2001 From: TheChymera Date: Mon, 21 Jan 2013 02:17:59 +0000 Subject: 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 83f628756..ae5f474a9 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 ff224d97a..9e77c93df 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" } -- cgit v1.2.3-65-gdbad From 7a96f989de310d52fe4471109e3c85682e76cc28 Mon Sep 17 00:00:00 2001 From: TheChymera Date: Mon, 21 Jan 2013 02:25:15 +0000 Subject: Corrected source repository Had been changed for testing. --- 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 9e77c93df..c66ee33f4 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" -- cgit v1.2.3-65-gdbad From ccb04bcdcfa98cd1090f4032eba52490bf02fdd7 Mon Sep 17 00:00:00 2001 From: TheChymera Date: Mon, 21 Jan 2013 19:50:26 +0000 Subject: 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 ae5f474a9..181ffc740 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 c66ee33f4..16bc5280c 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" } -- cgit v1.2.3-65-gdbad From 92005ccaedefc8e902bd3649916ecb41fb28596c Mon Sep 17 00:00:00 2001 From: TheChymera Date: Fri, 25 Jan 2013 10:48:41 +0000 Subject: 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 181ffc740..35adb643b 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 16bc5280c..4b4e34839 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 } -- cgit v1.2.3-65-gdbad From d2f3790332bbc6cef5dcc4c87ee842825e859fe1 Mon Sep 17 00:00:00 2001 From: TheChymera Date: Fri, 25 Jan 2013 18:00:07 +0000 Subject: 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 35adb643b..9d6b51dee 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 4b4e34839..88b339356 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 +} -- cgit v1.2.3-65-gdbad