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/wxpython: wxpython-2.8.10.1.ebuild ChangeLog
Date: Sat, 29 Aug 2009 14:43:14
Message-Id: E1MhTyB-0003VQ-5S@stork.gentoo.org
1 arfrever 09/08/29 19:52:15
2
3 Modified: wxpython-2.8.10.1.ebuild ChangeLog
4 Log:
5 Set SUPPORT_PYTHON_ABIS. Add missing dependency on dev-python/setuptools.
6 (Portage version: 14170-svn/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.2 dev-python/wxpython/wxpython-2.8.10.1.ebuild
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/wxpython/wxpython-2.8.10.1.ebuild?rev=1.2&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/wxpython/wxpython-2.8.10.1.ebuild?rev=1.2&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/wxpython/wxpython-2.8.10.1.ebuild?r1=1.1&r2=1.2
14
15 Index: wxpython-2.8.10.1.ebuild
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.8.10.1.ebuild,v
18 retrieving revision 1.1
19 retrieving revision 1.2
20 diff -u -r1.1 -r1.2
21 --- wxpython-2.8.10.1.ebuild 18 May 2009 03:21:16 -0000 1.1
22 +++ wxpython-2.8.10.1.ebuild 29 Aug 2009 19:52:14 -0000 1.2
23 @@ -1,11 +1,12 @@
24 # Copyright 1999-2009 Gentoo Foundation
25 # Distributed under the terms of the GNU General Public License v2
26 -# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.8.10.1.ebuild,v 1.1 2009/05/18 03:21:16 dirtyepic Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.8.10.1.ebuild,v 1.2 2009/08/29 19:52:14 arfrever Exp $
28
29 EAPI="2"
30 WX_GTK_VER="2.8"
31 +SUPPORT_PYTHON_ABIS="1"
32
33 -inherit alternatives eutils multilib python wxwidgets flag-o-matic fdo-mime
34 +inherit alternatives eutils fdo-mime flag-o-matic multilib python wxwidgets
35
36 MY_P="${P/wxpython-/wxPython-src-}"
37
38 @@ -19,9 +20,10 @@
39 LICENSE="wxWinLL-3"
40 SLOT="2.8"
41 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
42 -IUSE="cairo opengl doc examples"
43 +IUSE="cairo doc examples opengl"
44
45 RDEPEND="
46 + dev-python/setuptools
47 >=x11-libs/wxGTK-${PV}:2.8[opengl?]
48 >=dev-lang/python-2.4
49 >=x11-libs/gtk+-2.4
50 @@ -36,7 +38,9 @@
51 DEPEND="${RDEPEND}
52 dev-util/pkgconfig"
53
54 -S="${WORKDIR}/${MY_P}/wxPython/"
55 +RESTRICT_PYTHON_ABIS="3*"
56 +
57 +S="${WORKDIR}/${MY_P}/wxPython"
58 DOC_S="${WORKDIR}/wxPython-${PV}"
59
60 src_prepare() {
61 @@ -55,6 +59,8 @@
62 cd "${DOC_S}"
63 epatch "${FILESDIR}"/${PN}-${SLOT}-wxversion-demo.patch
64 fi
65 +
66 + python_copy_sources
67 }
68
69 src_configure() {
70 @@ -63,36 +69,45 @@
71 append-flags -fno-strict-aliasing
72
73 use opengl \
74 - && mypyconf="${mypyconf} BUILD_GLCANVAS=1" \
75 - || mypyconf="${mypyconf} BUILD_GLCANVAS=0"
76 + && mypyconf+=" BUILD_GLCANVAS=1" \
77 + || mypyconf+=" BUILD_GLCANVAS=0"
78
79 - mypyconf="${mypyconf} WX_CONFIG=${WX_CONFIG}"
80 - mypyconf="${mypyconf} WXPORT=gtk2 UNICODE=1"
81 + mypyconf+=" WX_CONFIG=${WX_CONFIG}"
82 + mypyconf+=" WXPORT=gtk2 UNICODE=1"
83 }
84
85 src_compile() {
86 - python setup.py ${mypyconf} build || die "setup.py build failed"
87 + building() {
88 + "$(PYTHON)" setup.py ${mypyconf} build
89 + }
90 + python_execute_function -s building
91 }
92
93 src_install() {
94 local mypyconf
95 - python_version
96 - local site_pkgs=/usr/$(get_libdir)/python${PYVER}/site-packages
97
98 - mypyconf="${mypyconf} WX_CONFIG=${WX_CONFIG}"
99 + mypyconf+=" WX_CONFIG=${WX_CONFIG}"
100 use opengl \
101 - && mypyconf="${mypyconf} BUILD_GLCANVAS=1" \
102 - || mypyconf="${mypyconf} BUILD_GLCANVAS=0"
103 + && mypyconf+=" BUILD_GLCANVAS=1" \
104 + || mypyconf+=" BUILD_GLCANVAS=0"
105
106 - mypyconf="${mypyconf} WXPORT=gtk2 UNICODE=1"
107 + mypyconf+=" WXPORT=gtk2 UNICODE=1"
108
109 - python setup.py ${mypyconf} install --root="${D}" \
110 - --install-purelib ${site_pkgs} || die "setup.py install failed"
111 + installation() {
112 + "$(PYTHON)" setup.py ${mypyconf} install --root="${D}" --install-purelib $(python_get_sitedir)
113 + }
114 + python_execute_function -s installation
115
116 # Collision protection.
117 - for file in "${D}"/usr/bin/* "${D}"/${site_pkgs}/wx{version.*,.pth}; do
118 + for file in "${D}"/usr/bin/*; do
119 mv "${file}" "${file}-${SLOT}"
120 done
121 + rename_files() {
122 + for file in "${D}$(python_get_sitedir)/"wx{version.*,.pth}; do
123 + mv "${file}" "${file}-${SLOT}"
124 + done
125 + }
126 + python_execute_function -q rename_files
127
128 dodoc "${S}"/docs/{CHANGES,PyManual,README,wxPackage,wxPythonManual}.txt
129
130 @@ -118,16 +133,15 @@
131 }
132
133 pkg_postinst() {
134 - local site_pkgs=/usr/$(get_libdir)/python${PYVER}/site-packages
135 -
136 - python_mod_optimize ${site_pkgs}
137 -
138 fdo-mime_desktop_database_update
139
140 - alternatives_auto_makesym \
141 - "${site_pkgs}/wx.pth" "${site_pkgs}/wx.pth-[0-9].[0-9]"
142 - alternatives_auto_makesym \
143 - "${site_pkgs}/wxversion.py" "${site_pkgs}/wxversion.py-[0-9].[0-9]"
144 + create_symlinks() {
145 + alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]"
146 + alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]"
147 + }
148 + python_execute_function --action-message 'Updating symlinks with Python ${PYTHON_ABI}' create_symlinks
149 +
150 + python_mod_optimize wx-${SLOT}-gtk2-unicode wxversion.py
151
152 echo
153 elog "Gentoo uses the Multi-version method for SLOT'ing."
154 @@ -160,12 +174,11 @@
155 pkg_postrm() {
156 python_mod_cleanup
157
158 - local site_pkgs=/usr/$(get_libdir)/python${PYVER}/site-packages
159 -
160 fdo-mime_desktop_database_update
161
162 - alternatives_auto_makesym \
163 - "${site_pkgs}/wx.pth" "${site_pkgs}/wx.pth-[0-9].[0-9]"
164 - alternatives_auto_makesym \
165 - "${site_pkgs}/wxversion.py" "${site_pkgs}/wxversion.py-[0-9].[0-9]"
166 + create_symlinks() {
167 + alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]"
168 + alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]"
169 + }
170 + python_execute_function --action-message 'Updating symlinks with Python ${PYTHON_ABI}' create_symlinks
171 }
172
173
174
175 1.123 dev-python/wxpython/ChangeLog
176
177 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/wxpython/ChangeLog?rev=1.123&view=markup
178 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/wxpython/ChangeLog?rev=1.123&content-type=text/plain
179 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/wxpython/ChangeLog?r1=1.122&r2=1.123
180
181 Index: ChangeLog
182 ===================================================================
183 RCS file: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v
184 retrieving revision 1.122
185 retrieving revision 1.123
186 diff -u -r1.122 -r1.123
187 --- ChangeLog 18 May 2009 03:21:16 -0000 1.122
188 +++ ChangeLog 29 Aug 2009 19:52:14 -0000 1.123
189 @@ -1,6 +1,10 @@
190 # ChangeLog for dev-python/wxpython
191 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
192 -# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.122 2009/05/18 03:21:16 dirtyepic Exp $
193 +# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.123 2009/08/29 19:52:14 arfrever Exp $
194 +
195 + 29 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
196 + wxpython-2.8.10.1.ebuild:
197 + Set SUPPORT_PYTHON_ABIS. Add missing dependency on dev-python/setuptools.
198
199 *wxpython-2.8.10.1 (18 May 2009)
Report Message
Find on MARC Find on Google Groups