Gentoo Archives: gentoo-commits

From: Kacper Kowalik <xarthisius@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sci-biology/psychopy/
Date: Mon, 28 Jan 2013 17:49:01
Message-Id: 1359395324.af8619116694d7a5bcfd27620547dc3b7d909aad.xarthisius@gentoo
1 commit: af8619116694d7a5bcfd27620547dc3b7d909aad
2 Author: Kacper Kowalik (Xarthisius) <xarthisius <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 28 17:48:44 2013 +0000
4 Commit: Kacper Kowalik <xarthisius <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 28 17:48:44 2013 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=af861911
7
8 [sci-biology/psychopy] fix typo in inherit, add metadata, make repoman happy
9
10 ---
11 sci-biology/psychopy/metadata.xml | 8 +++++++
12 sci-biology/psychopy/psychopy-1.75.01.ebuild | 28 +++++++++++++-------------
13 sci-biology/psychopy/psychopy-9999.ebuild | 10 ++++----
14 3 files changed, 27 insertions(+), 19 deletions(-)
15
16 diff --git a/sci-biology/psychopy/metadata.xml b/sci-biology/psychopy/metadata.xml
17 new file mode 100644
18 index 0000000..c791a24
19 --- /dev/null
20 +++ b/sci-biology/psychopy/metadata.xml
21 @@ -0,0 +1,8 @@
22 +<?xml version="1.0" encoding="UTF-8"?>
23 +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
24 +<pkgmetadata>
25 + <maintainer>
26 + <email>h.chr@××××.ru</email>
27 + <name>TheChymera</name>
28 + </maintainer>
29 +</pkgmetadata>
30
31 diff --git a/sci-biology/psychopy/psychopy-1.75.01.ebuild b/sci-biology/psychopy/psychopy-1.75.01.ebuild
32 index 9d6b51d..ee50eb0 100644
33 --- a/sci-biology/psychopy/psychopy-1.75.01.ebuild
34 +++ b/sci-biology/psychopy/psychopy-1.75.01.ebuild
35 @@ -1,4 +1,4 @@
36 -# Copyright 1999-2012 Gentoo Foundation
37 +# Copyright 1999-2013 Gentoo Foundation
38 # Distributed under the terms of the GNU General Public License v2
39 # $Header: $
40
41 @@ -23,16 +23,16 @@ KEYWORDS="~amd64 ~x86"
42 IUSE="test"
43
44 RDEPEND="dev-python/numpy[lapack]
45 - sci-libs/scipy
46 - dev-python/matplotlib
47 - dev-python/pyopengl[${PYTHON_USEDEP}]
48 - dev-python/imaging
49 - dev-python/wxpython
50 - dev-python/setuptools[${PYTHON_USEDEP}]
51 - dev-python/lxml[${PYTHON_USEDEP}]
52 - app-admin/eselect
53 - dev-python/pyglet
54 - dev-python/pygame"
55 + sci-libs/scipy
56 + dev-python/matplotlib
57 + dev-python/pyopengl[${PYTHON_USEDEP}]
58 + dev-python/imaging
59 + dev-python/wxpython
60 + dev-python/setuptools[${PYTHON_USEDEP}]
61 + dev-python/lxml[${PYTHON_USEDEP}]
62 + app-admin/eselect
63 + dev-python/pyglet
64 + dev-python/pygame"
65
66 DEPEND="app-arch/unzip
67 dev-python/setuptools
68 @@ -43,9 +43,9 @@ RESTRICT="test" # interactive, opens lots of windows
69 S="${WORKDIR}/${MY_P}"
70
71 python_install_all() {
72 - distutils-r1_python_install_all
73 - doicon psychopy/monitors/psychopy.ico
74 - make_desktop_entry psychopyapp.py PsychoPy psychopy "Science;Biology"
75 + distutils-r1_python_install_all
76 + doicon psychopy/monitors/psychopy.ico
77 + make_desktop_entry psychopyapp.py PsychoPy psychopy "Science;Biology"
78 }
79
80 pkg_postinst() {
81
82 diff --git a/sci-biology/psychopy/psychopy-9999.ebuild b/sci-biology/psychopy/psychopy-9999.ebuild
83 index 88b3393..7511293 100644
84 --- a/sci-biology/psychopy/psychopy-9999.ebuild
85 +++ b/sci-biology/psychopy/psychopy-9999.ebuild
86 @@ -5,7 +5,7 @@
87 EAPI="5"
88 PYTHON_COMPAT=( python2_7 )
89
90 -inherit eutils gnome2-eutils distutils-r1 git-2
91 +inherit eutils gnome2-utils distutils-r1 git-2
92
93 DESCRIPTION="Python experiemntal psychology toolkit"
94 HOMEPAGE="http://www.psychopy.org/"
95 @@ -22,16 +22,16 @@ RDEPEND="${DEPEND}
96 dev-python/lxml[${PYTHON_USEDEP}]
97 dev-python/matplotlib
98 dev-python/numpy[lapack]
99 - dev-python/pygame
100 + dev-python/pygame
101 dev-python/pyglet
102 dev-python/pyopengl[${PYTHON_USEDEP}]
103 dev-python/wxpython
104 sci-libs/scipy"
105
106 python_install_all() {
107 - distutils-r1_python_install_all
108 - newicon -s scalable psychopy/monitors/psychopy-icon.svg psychopy.svg
109 - make_desktop_entry psychopyApp.py PsychoPy psychopy "Science;Biology"
110 + distutils-r1_python_install_all
111 + newicon -s scalable psychopy/monitors/psychopy-icon.svg psychopy.svg
112 + make_desktop_entry psychopyApp.py PsychoPy psychopy "Science;Biology"
113 }
114
115 pkg_postinst() {