1 |
dirtyepic 08/11/26 02:20:19 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: wxpython-2.8.9.1-r2.ebuild |
5 |
Removed: wxpython-2.8.9.1-r1.ebuild |
6 |
Log: |
7 |
Fix build options not getting passed to src_compile due to mypyconf being |
8 |
declared locally in src_configure. |
9 |
(Portage version: 2.2_rc16/cvs/Linux 2.6.27-gentoo-r4 x86_64) |
10 |
|
11 |
Revision Changes Path |
12 |
1.107 dev-python/wxpython/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/wxpython/ChangeLog?rev=1.107&view=markup |
15 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/wxpython/ChangeLog?rev=1.107&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/wxpython/ChangeLog?r1=1.106&r2=1.107 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v |
21 |
retrieving revision 1.106 |
22 |
retrieving revision 1.107 |
23 |
diff -u -r1.106 -r1.107 |
24 |
--- ChangeLog 27 Oct 2008 18:52:39 -0000 1.106 |
25 |
+++ ChangeLog 26 Nov 2008 02:20:19 -0000 1.107 |
26 |
@@ -1,6 +1,13 @@ |
27 |
# ChangeLog for dev-python/wxpython |
28 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.106 2008/10/27 18:52:39 jer Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.107 2008/11/26 02:20:19 dirtyepic Exp $ |
31 |
+ |
32 |
+*wxpython-2.8.9.1-r2 (26 Nov 2008) |
33 |
+ |
34 |
+ 26 Nov 2008; Ryan Hill <dirtyepic@g.o> -wxpython-2.8.9.1-r1.ebuild, |
35 |
+ +wxpython-2.8.9.1-r2.ebuild: |
36 |
+ Fix build options not getting passed to src_compile due to mypyconf being |
37 |
+ declared locally in src_configure. |
38 |
|
39 |
27 Oct 2008; Jeroen Roovers <jer@g.o> wxpython-2.8.8.1.ebuild: |
40 |
Stable for HPPA (bug #242088). |
41 |
|
42 |
|
43 |
|
44 |
1.1 dev-python/wxpython/wxpython-2.8.9.1-r2.ebuild |
45 |
|
46 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/wxpython/wxpython-2.8.9.1-r2.ebuild?rev=1.1&view=markup |
47 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/wxpython/wxpython-2.8.9.1-r2.ebuild?rev=1.1&content-type=text/plain |
48 |
|
49 |
Index: wxpython-2.8.9.1-r2.ebuild |
50 |
=================================================================== |
51 |
# Copyright 1999-2008 Gentoo Foundation |
52 |
# Distributed under the terms of the GNU General Public License v2 |
53 |
# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.8.9.1-r2.ebuild,v 1.1 2008/11/26 02:20:19 dirtyepic Exp $ |
54 |
|
55 |
EAPI="2" |
56 |
WX_GTK_VER="2.8" |
57 |
|
58 |
inherit alternatives eutils multilib python wxwidgets flag-o-matic |
59 |
# We don't use distutils.eclass because it doesn't seem to play nice with |
60 |
# need-wxwidgets |
61 |
|
62 |
MY_P="${P/wxpython-/wxPython-src-}" |
63 |
DESCRIPTION="A blending of the wxWindows C++ class library with Python" |
64 |
HOMEPAGE="http://www.wxpython.org/" |
65 |
SRC_URI="mirror://sourceforge/wxpython/${MY_P}.tar.bz2" |
66 |
|
67 |
LICENSE="wxWinLL-3" |
68 |
SLOT="2.8" |
69 |
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
70 |
IUSE="cairo opengl" |
71 |
|
72 |
RDEPEND=">=x11-libs/wxGTK-${PV}:2.8[opengl?] |
73 |
>=dev-lang/python-2.4 |
74 |
>=x11-libs/gtk+-2.4 |
75 |
>=x11-libs/pango-1.2 |
76 |
>=dev-libs/glib-2.0 |
77 |
media-libs/libpng |
78 |
media-libs/jpeg |
79 |
media-libs/tiff |
80 |
cairo? ( dev-python/pycairo ) |
81 |
opengl? ( >=dev-python/pyopengl-2.0.0.44 )" |
82 |
|
83 |
DEPEND="${RDEPEND} |
84 |
dev-util/pkgconfig" |
85 |
|
86 |
S="${WORKDIR}/${MY_P}/wxPython/" |
87 |
|
88 |
src_prepare() { |
89 |
sed -i "s:cflags.append('-O3'):pass:" config.py || die "sed failed" |
90 |
epatch "${FILESDIR}"/${PN}-2.8.8-wxversion-scripts.patch |
91 |
} |
92 |
|
93 |
src_configure() { |
94 |
need-wxwidgets unicode |
95 |
|
96 |
append-flags -fno-strict-aliasing |
97 |
|
98 |
use opengl \ |
99 |
&& mypyconf="${mypyconf} BUILD_GLCANVAS=1" \ |
100 |
|| mypyconf="${mypyconf} BUILD_GLCANVAS=0" |
101 |
|
102 |
mypyconf="${mypyconf} WX_CONFIG=${WX_CONFIG}" |
103 |
mypyconf="${mypyconf} WXPORT=gtk2 UNICODE=1" |
104 |
} |
105 |
|
106 |
src_compile() { |
107 |
python setup.py ${mypyconf} build || die "setup.py build failed" |
108 |
} |
109 |
|
110 |
src_install() { |
111 |
local mypyconf |
112 |
python_version |
113 |
local site_pkgs=/usr/$(get_libdir)/python${PYVER}/site-packages |
114 |
|
115 |
mypyconf="${mypyconf} WX_CONFIG=${WX_CONFIG}" |
116 |
use opengl \ |
117 |
&& mypyconf="${mypyconf} BUILD_GLCANVAS=1" \ |
118 |
|| mypyconf="${mypyconf} BUILD_GLCANVAS=0" |
119 |
|
120 |
mypyconf="${mypyconf} WXPORT=gtk2 UNICODE=1" |
121 |
|
122 |
python setup.py ${mypyconf} install --root="${D}" \ |
123 |
--install-purelib ${site_pkgs} || die "setup.py install failed" |
124 |
|
125 |
# Collision protection. |
126 |
for file in "${D}"/usr/bin/* "${D}"/${site_pkgs}/wx{version.*,.pth}; do |
127 |
mv "${file}" "${file}-${SLOT}" |
128 |
done |
129 |
|
130 |
for dir in "${D}"/${site_pkgs}/wx-${SLOT}-gtk2-{ansi,unicode}; do |
131 |
if [[ -d ${dir} ]]; then |
132 |
cp -R "${D}"/${site_pkgs}/wxaddons/ "${dir}" |
133 |
wxaddons_copied=1 |
134 |
fi |
135 |
done |
136 |
|
137 |
[[ ${wxaddons_copied} ]] && rm -rf "${D}"/${site_pkgs}/wxaddons/ |
138 |
} |
139 |
|
140 |
pkg_postinst() { |
141 |
local site_pkgs=/usr/$(get_libdir)/python${PYVER}/site-packages |
142 |
|
143 |
python_mod_optimize ${site_pkgs} |
144 |
|
145 |
alternatives_auto_makesym \ |
146 |
"${site_pkgs}/wx.pth" "${site_pkgs}/wx.pth-[0-9].[0-9]" |
147 |
alternatives_auto_makesym \ |
148 |
"${site_pkgs}/wxversion.py" "${site_pkgs}/wxversion.py-[0-9].[0-9]" |
149 |
|
150 |
echo |
151 |
elog "Gentoo uses the Multi-version method for SLOT'ing." |
152 |
elog "Developers see this site for instructions on using 2.6 or 2.8" |
153 |
elog "with your apps:" |
154 |
elog "http://wiki.wxpython.org/index.cgi/MultiVersionInstalls" |
155 |
echo |
156 |
} |
157 |
|
158 |
pkg_postrm() { |
159 |
python_mod_cleanup |
160 |
|
161 |
local site_pkgs=/usr/$(get_libdir)/python${PYVER}/site-packages |
162 |
|
163 |
alternatives_auto_makesym \ |
164 |
"${site_pkgs}/wx.pth" "${site_pkgs}/wx.pth-[0-9].[0-9]" |
165 |
alternatives_auto_makesym \ |
166 |
"${site_pkgs}/wxversion.py" "${site_pkgs}/wxversion.py-[0-9].[0-9]" |
167 |
} |