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

Gentoo Archives: gentoo-commits

From: "Maciej Mrozowski (reavertm)" <reavertm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in kde-base/pykde4: pykde4-4.4.2.ebuild ChangeLog pykde4-4.4.3.ebuild
Date: Wed, 02 Jun 2010 07:38:01
Message-Id: 20100602073755.178E12CF38@corvid.gentoo.org
1 reavertm 10/06/02 07:37:54
2
3 Modified: pykde4-4.4.2.ebuild ChangeLog pykde4-4.4.3.ebuild
4 Log:
5 pykde4 does not support multiple python ABIs, update ebuilds accordingly
6 (Portage version: 2.2_rc67/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.2 kde-base/pykde4/pykde4-4.4.2.ebuild
10
11 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/pykde4/pykde4-4.4.2.ebuild?rev=1.2&view=markup
12 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/pykde4/pykde4-4.4.2.ebuild?rev=1.2&content-type=text/plain
13 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/pykde4/pykde4-4.4.2.ebuild?r1=1.1&r2=1.2
14
15 Index: pykde4-4.4.2.ebuild
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.4.2.ebuild,v
18 retrieving revision 1.1
19 retrieving revision 1.2
20 diff -u -r1.1 -r1.2
21 --- pykde4-4.4.2.ebuild 30 Mar 2010 22:03:39 -0000 1.1
22 +++ pykde4-4.4.2.ebuild 2 Jun 2010 07:37:54 -0000 1.2
23 @@ -1,6 +1,6 @@
24 # Copyright 1999-2010 Gentoo Foundation
25 # Distributed under the terms of the GNU General Public License v2
26 -# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.4.2.ebuild,v 1.1 2010/03/30 22:03:39 spatz Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.4.2.ebuild,v 1.2 2010/06/02 07:37:54 reavertm Exp $
28
29 EAPI="3"
30
31 @@ -8,7 +8,7 @@
32 KMMODULE="python/pykde4"
33 OPENGL_REQUIRED="always"
34 PYTHON_USE_WITH="threads"
35 -SUPPORT_PYTHON_ABIS="1"
36 +RESTRICT_PYTHON_ABIS="2.4"
37 inherit python kde4-meta
38
39 DESCRIPTION="Python bindings for KDE4"
40 @@ -37,12 +37,10 @@
41 sed -e '/^ADD_SUBDIRECTORY(examples)/s/^/# DISABLED /' -i python/${PN}/CMakeLists.txt \
42 || die "Failed to disable examples"
43 fi
44 -
45 - python_copy_sources
46 }
47
48 src_configure() {
49 - savedcmakeargs=(
50 + mycmakeargs=(
51 -DWITH_QScintilla=OFF
52 -DWITH_PolkitQt=OFF
53 $(cmake-utils_use_with semantic-desktop Soprano)
54 @@ -50,63 +48,22 @@
55 $(cmake-utils_use_with akonadi KdepimLibs)
56 )
57
58 - do_src_configure() {
59 - mycmakeargs=("${savedcmakeargs[@]}")
60 -
61 - CMAKE_USE_DIR="${S}-${PYTHON_ABI}"
62 - kde4-meta_src_configure
63 -
64 - local value=$(declare -p mycmakeargs)
65 - value=${value#*=}
66 - declare -a "savedcmakeargs_${PYTHON_ABI//./_}=$value"
67 - }
68 -
69 - python_execute_function -s do_src_configure
70 -}
71 -
72 -src_compile() {
73 - do_src_compile() {
74 - CMAKE_USE_DIR="${S}-${PYTHON_ABI}"
75 - kde4-meta_src_compile
76 - }
77 -
78 - python_execute_function -s do_src_compile
79 -}
80 -
81 -src_test() {
82 - do_src_test() {
83 - local var=savedcmakeargs_${PYTHON_ABI//./_}
84 - local value=$(declare -p $var)
85 - value=${value#*=}
86 - declare -a "mycmakeargs=$value"
87 -
88 - CMAKE_USE_DIR="${S}-${PYTHON_ABI}"
89 - kde4-meta_src_test
90 - export ${var}="${mycmakeargs}"
91 - }
92 -
93 - python_execute_function -s do_src_test
94 + kde4-meta_src_configure
95 }
96
97 src_install() {
98 - if use doc; then
99 - dohtml -r "${S}"/python/pykde4/docs/html/* || die 'dohtml failed'
100 - fi
101 -
102 - do_src_install() {
103 - CMAKE_USE_DIR="${S}-${PYTHON_ABI}"
104 - kde4-meta_src_install
105 + use doc && HTML_DOCS=("${S}/python/pykde4/docs/html/")
106
107 - rm -f "${ED}$(python_get_sitedir)"/PyKDE4/*.py[co]
108 - }
109 + kde4-meta_src_install
110
111 - python_execute_function -s do_src_install
112 + python_convert_shebangs -q -r $(python_get_version) "${ED}"
113 + find "${ED}" -type f -name '*.py[co]' -exec rm -f {} +
114 }
115
116 pkg_postinst() {
117 kde4-meta_pkg_postinst
118
119 - python_mod_optimize PyKDE4
120 + python_mod_optimize PyKDE4 PyQt4
121
122 if use examples; then
123 echo
124 @@ -119,5 +76,5 @@
125 pkg_postrm() {
126 kde4-meta_pkg_postrm
127
128 - python_mod_cleanup PyKDE4
129 + python_mod_cleanup PyKDE4 PyQt4
130 }
131
132
133
134 1.68 kde-base/pykde4/ChangeLog
135
136 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/pykde4/ChangeLog?rev=1.68&view=markup
137 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/pykde4/ChangeLog?rev=1.68&content-type=text/plain
138 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/pykde4/ChangeLog?r1=1.67&r2=1.68
139
140 Index: ChangeLog
141 ===================================================================
142 RCS file: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v
143 retrieving revision 1.67
144 retrieving revision 1.68
145 diff -u -r1.67 -r1.68
146 --- ChangeLog 4 May 2010 05:52:50 -0000 1.67
147 +++ ChangeLog 2 Jun 2010 07:37:54 -0000 1.68
148 @@ -1,6 +1,10 @@
149 # ChangeLog for kde-base/pykde4
150 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
151 -# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.67 2010/05/04 05:52:50 alexxy Exp $
152 +# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.68 2010/06/02 07:37:54 reavertm Exp $
153 +
154 + 02 Jun 2010; Maciej Mrozowski <reavertm@g.o> pykde4-4.4.2.ebuild,
155 + pykde4-4.4.3.ebuild:
156 + pykde4 does not support multiple python ABIs, update ebuilds accordingly
157
158 04 May 2010; Alexey Shvetsov <alexxy@g.o> -pykde4-4.4.1.ebuild:
159 Drop KDE SC 4.4.1
160
161
162
163 1.3 kde-base/pykde4/pykde4-4.4.3.ebuild
164
165 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/pykde4/pykde4-4.4.3.ebuild?rev=1.3&view=markup
166 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/pykde4/pykde4-4.4.3.ebuild?rev=1.3&content-type=text/plain
167 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/pykde4/pykde4-4.4.3.ebuild?r1=1.2&r2=1.3
168
169 Index: pykde4-4.4.3.ebuild
170 ===================================================================
171 RCS file: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.4.3.ebuild,v
172 retrieving revision 1.2
173 retrieving revision 1.3
174 diff -u -r1.2 -r1.3
175 --- pykde4-4.4.3.ebuild 6 May 2010 18:41:23 -0000 1.2
176 +++ pykde4-4.4.3.ebuild 2 Jun 2010 07:37:54 -0000 1.3
177 @@ -1,15 +1,14 @@
178 # Copyright 1999-2010 Gentoo Foundation
179 # Distributed under the terms of the GNU General Public License v2
180 -# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.4.3.ebuild,v 1.2 2010/05/06 18:41:23 arfrever Exp $
181 +# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.4.3.ebuild,v 1.3 2010/06/02 07:37:54 reavertm Exp $
182
183 EAPI="3"
184
185 KMNAME="kdebindings"
186 KMMODULE="python/pykde4"
187 OPENGL_REQUIRED="always"
188 -PYTHON_DEPEND="*:2.5"
189 PYTHON_USE_WITH="threads"
190 -SUPPORT_PYTHON_ABIS="1"
191 +RESTRICT_PYTHON_ABIS="2.4"
192 inherit python kde4-meta
193
194 DESCRIPTION="Python bindings for KDE4"
195 @@ -25,7 +24,6 @@
196 !aqua? ( >=dev-python/PyQt4-4.7[dbus,sql,svg,webkit,X] )
197 "
198 RDEPEND="${DEPEND}"
199 -RESTRICT_PYTHON_ABIS="2.4"
200
201 pkg_setup() {
202 python_pkg_setup
203 @@ -39,12 +37,10 @@
204 sed -e '/^ADD_SUBDIRECTORY(examples)/s/^/# DISABLED /' -i python/${PN}/CMakeLists.txt \
205 || die "Failed to disable examples"
206 fi
207 -
208 - python_copy_sources
209 }
210
211 src_configure() {
212 - savedcmakeargs=(
213 + mycmakeargs=(
214 -DWITH_QScintilla=OFF
215 -DWITH_PolkitQt=OFF
216 $(cmake-utils_use_with semantic-desktop Soprano)
217 @@ -52,63 +48,22 @@
218 $(cmake-utils_use_with akonadi KdepimLibs)
219 )
220
221 - do_src_configure() {
222 - mycmakeargs=("${savedcmakeargs[@]}")
223 -
224 - CMAKE_USE_DIR="${S}-${PYTHON_ABI}"
225 - kde4-meta_src_configure
226 -
227 - local value=$(declare -p mycmakeargs)
228 - value=${value#*=}
229 - declare -a "savedcmakeargs_${PYTHON_ABI//./_}=$value"
230 - }
231 -
232 - python_execute_function -s do_src_configure
233 -}
234 -
235 -src_compile() {
236 - do_src_compile() {
237 - CMAKE_USE_DIR="${S}-${PYTHON_ABI}"
238 - kde4-meta_src_compile
239 - }
240 -
241 - python_execute_function -s do_src_compile
242 -}
243 -
244 -src_test() {
245 - do_src_test() {
246 - local var=savedcmakeargs_${PYTHON_ABI//./_}
247 - local value=$(declare -p $var)
248 - value=${value#*=}
249 - declare -a "mycmakeargs=$value"
250 -
251 - CMAKE_USE_DIR="${S}-${PYTHON_ABI}"
252 - kde4-meta_src_test
253 - export ${var}="${mycmakeargs}"
254 - }
255 -
256 - python_execute_function -s do_src_test
257 + kde4-meta_src_configure
258 }
259
260 src_install() {
261 - if use doc; then
262 - dohtml -r "${S}"/python/pykde4/docs/html/* || die 'dohtml failed'
263 - fi
264 -
265 - do_src_install() {
266 - CMAKE_USE_DIR="${S}-${PYTHON_ABI}"
267 - kde4-meta_src_install
268 + use doc && HTML_DOCS=("${S}/python/pykde4/docs/html/")
269
270 - rm -f "${ED}$(python_get_sitedir)"/PyKDE4/*.py[co]
271 - }
272 + kde4-meta_src_install
273
274 - python_execute_function -s do_src_install
275 + python_convert_shebangs -q -r $(python_get_version) "${ED}"
276 + find "${ED}" -type f -name '*.py[co]' -exec rm -f {} +
277 }
278
279 pkg_postinst() {
280 kde4-meta_pkg_postinst
281
282 - python_mod_optimize PyKDE4
283 + python_mod_optimize PyKDE4 PyQt4
284
285 if use examples; then
286 echo
287 @@ -121,5 +76,5 @@
288 pkg_postrm() {
289 kde4-meta_pkg_postrm
290
291 - python_mod_cleanup PyKDE4
292 + python_mod_cleanup PyKDE4 PyQt4
293 }
Report Message
Find on MARC Find on Google Groups