Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Arfrever Frehtes Taifersar Arahesis (arfrever)" <arfrever@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-python/cherrypy: ChangeLog cherrypy-2.3.0.ebuild cherrypy-3.1.2.ebuild
Date: Fri, 02 Apr 2010 18:49:59
Message-Id: E1NxlwJ-0003wY-H2@stork.gentoo.org
1 arfrever 10/04/02 18:49:55
2
3 Modified: ChangeLog cherrypy-2.3.0.ebuild
4 cherrypy-3.1.2.ebuild
5 Log:
6 Set SUPPORT_PYTHON_ABIS.
7 (Portage version: HEAD/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.39 dev-python/cherrypy/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/cherrypy/ChangeLog?rev=1.39&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/cherrypy/ChangeLog?rev=1.39&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/cherrypy/ChangeLog?r1=1.38&r2=1.39
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/dev-python/cherrypy/ChangeLog,v
19 retrieving revision 1.38
20 retrieving revision 1.39
21 diff -u -r1.38 -r1.39
22 --- ChangeLog 26 Nov 2009 17:25:22 -0000 1.38
23 +++ ChangeLog 2 Apr 2010 18:49:55 -0000 1.39
24 @@ -1,6 +1,10 @@
25 # ChangeLog for dev-python/cherrypy
26 -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/ChangeLog,v 1.38 2009/11/26 17:25:22 armin76 Exp $
28 +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
29 +# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/ChangeLog,v 1.39 2010/04/02 18:49:55 arfrever Exp $
30 +
31 + 02 Apr 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
32 + cherrypy-2.3.0.ebuild, cherrypy-3.1.2.ebuild:
33 + Set SUPPORT_PYTHON_ABIS.
34
35 26 Nov 2009; Raúl Porcel <armin76@g.o> cherrypy-3.1.2.ebuild:
36 ia64 stable wrt #294109
37
38
39
40 1.3 dev-python/cherrypy/cherrypy-2.3.0.ebuild
41
42 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/cherrypy/cherrypy-2.3.0.ebuild?rev=1.3&view=markup
43 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/cherrypy/cherrypy-2.3.0.ebuild?rev=1.3&content-type=text/plain
44 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/cherrypy/cherrypy-2.3.0.ebuild?r1=1.2&r2=1.3
45
46 Index: cherrypy-2.3.0.ebuild
47 ===================================================================
48 RCS file: /var/cvsroot/gentoo-x86/dev-python/cherrypy/cherrypy-2.3.0.ebuild,v
49 retrieving revision 1.2
50 retrieving revision 1.3
51 diff -u -r1.2 -r1.3
52 --- cherrypy-2.3.0.ebuild 15 Feb 2009 14:31:56 -0000 1.2
53 +++ cherrypy-2.3.0.ebuild 2 Apr 2010 18:49:55 -0000 1.3
54 @@ -1,35 +1,39 @@
55 -# Copyright 1999-2009 Gentoo Foundation
56 +# Copyright 1999-2010 Gentoo Foundation
57 # Distributed under the terms of the GNU General Public License v2
58 -# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/cherrypy-2.3.0.ebuild,v 1.2 2009/02/15 14:31:56 patrick Exp $
59 +# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/cherrypy-2.3.0.ebuild,v 1.3 2010/04/02 18:49:55 arfrever Exp $
60
61 -inherit eutils distutils
62 +EAPI="3"
63 +PYTHON_DEPEND="2"
64 +SUPPORT_PYTHON_ABIS="1"
65
66 -MY_P=CherryPy-${PV}
67 +inherit distutils eutils
68 +
69 +MY_P="CherryPy-${PV}"
70
71 DESCRIPTION="CherryPy is a pythonic, object-oriented web development framework."
72 -SRC_URI="http://download.cherrypy.org/cherrypy/${PV}/${MY_P}.tar.gz"
73 -HOMEPAGE="http://www.cherrypy.org/"
74 -IUSE="doc test"
75 +HOMEPAGE="http://www.cherrypy.org/ http://pypi.python.org/pypi/CherryPy"
76 +SRC_URI="http://download.cherrypy.org/${PN}/${PV}/${MY_P}.tar.gz"
77 +
78 +LICENSE="BSD"
79 SLOT="0"
80 KEYWORDS="~amd64 ~x86"
81 -LICENSE="BSD"
82 +IUSE="doc test"
83
84 DEPEND="dev-python/setuptools
85 test? ( >=dev-python/webtest-1.0 )
86 app-arch/unzip"
87 RDEPEND=""
88 +RESTRICT_PYTHON_ABIS="3.*"
89
90 -S=${WORKDIR}/${MY_P}
91 +S="${WORKDIR}/${MY_P}"
92
93 -src_unpack() {
94 - unpack ${A}
95 - cd "${S}"
96 -
97 - #Remove test_cache_filter, only works outside of portage
98 +src_prepare() {
99 + # Remove test_cache_filter, only works outside of portage
100 sed -i \
101 -e '/raw_input/d' \
102 -e "/'test_cache_filter',/d" \
103 cherrypy/test/test.py || die "sed failed"
104 +
105 sed -i \
106 -e 's/"cherrypy.tutorial",//' \
107 -e "/('cherrypy\/tutorial',/, /),/d" \
108 @@ -37,14 +41,18 @@
109 setup.py || die "sed failed"
110 }
111
112 +src_test() {
113 + testing() {
114 + PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" cherrypy/test/test.py
115 + }
116 + python_execute_function testing
117 +}
118 +
119 src_install() {
120 distutils_src_install
121 - if use doc ; then
122 +
123 + if use doc; then
124 insinto /usr/share/doc/${PF}
125 doins -r cherrypy/tutorial
126 fi
127 }
128 -
129 -src_test() {
130 - PYTHONPATH=. "${python}" cherrypy/test/test.py || die "test failed"
131 -}
132
133
134
135 1.7 dev-python/cherrypy/cherrypy-3.1.2.ebuild
136
137 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/cherrypy/cherrypy-3.1.2.ebuild?rev=1.7&view=markup
138 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/cherrypy/cherrypy-3.1.2.ebuild?rev=1.7&content-type=text/plain
139 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/cherrypy/cherrypy-3.1.2.ebuild?r1=1.6&r2=1.7
140
141 Index: cherrypy-3.1.2.ebuild
142 ===================================================================
143 RCS file: /var/cvsroot/gentoo-x86/dev-python/cherrypy/cherrypy-3.1.2.ebuild,v
144 retrieving revision 1.6
145 retrieving revision 1.7
146 diff -u -r1.6 -r1.7
147 --- cherrypy-3.1.2.ebuild 26 Nov 2009 17:25:22 -0000 1.6
148 +++ cherrypy-3.1.2.ebuild 2 Apr 2010 18:49:55 -0000 1.7
149 @@ -1,44 +1,49 @@
150 -# Copyright 1999-2009 Gentoo Foundation
151 +# Copyright 1999-2010 Gentoo Foundation
152 # Distributed under the terms of the GNU General Public License v2
153 -# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/cherrypy-3.1.2.ebuild,v 1.6 2009/11/26 17:25:22 armin76 Exp $
154 +# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/cherrypy-3.1.2.ebuild,v 1.7 2010/04/02 18:49:55 arfrever Exp $
155 +
156 +EAPI="3"
157 +PYTHON_DEPEND="2"
158 +SUPPORT_PYTHON_ABIS="1"
159
160 inherit distutils
161
162 -MY_P=CherryPy-${PV}
163 +MY_P="CherryPy-${PV}"
164
165 DESCRIPTION="CherryPy is a pythonic, object-oriented web development framework."
166 HOMEPAGE="http://www.cherrypy.org/ http://pypi.python.org/pypi/CherryPy"
167 SRC_URI="http://download.cherrypy.org/${PN}/${PV}/${MY_P}.tar.gz"
168
169 -IUSE="doc"
170 +LICENSE="BSD"
171 SLOT="0"
172 KEYWORDS="amd64 ia64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
173 -LICENSE="BSD"
174 +IUSE="doc"
175
176 DEPEND=""
177 RDEPEND=""
178 +RESTRICT_PYTHON_ABIS="3.*"
179
180 S="${WORKDIR}/${MY_P}"
181
182 -src_unpack() {
183 - unpack ${A}
184 - cd "${S}"
185 -
186 +src_prepare() {
187 sed -i \
188 -e 's/"cherrypy.tutorial",//' \
189 -e "/('cherrypy\/tutorial',/, /),/d" \
190 setup.py || die "sed failed"
191 +}
192
193 +src_test() {
194 + testing() {
195 + PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" cherrypy/test/test.py --dumb
196 + }
197 + python_execute_function testing
198 }
199
200 src_install() {
201 distutils_src_install
202 - if use doc ; then
203 - insinto "/usr/share/doc/${PF}"
204 +
205 + if use doc; then
206 + insinto /usr/share/doc/${PF}
207 doins -r cherrypy/tutorial
208 fi
209 }
210 -
211 -src_test() {
212 - PYTHONPATH=. "${python}" cherrypy/test/test.py --dumb || die "test failed"
213 -}
Report Message
Find on MARC Find on Google Groups