1 |
arfrever 09/10/30 11:45:29 |
2 |
|
3 |
Modified: python-2.4.6.ebuild python-2.5.4-r3.ebuild |
4 |
python-3.1.1-r1.ebuild |
5 |
Log: |
6 |
Small updates. |
7 |
|
8 |
Revision Changes Path |
9 |
1.23 dev-lang/python/python-2.4.6.ebuild |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-2.4.6.ebuild?rev=1.23&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-2.4.6.ebuild?rev=1.23&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-2.4.6.ebuild?r1=1.22&r2=1.23 |
14 |
|
15 |
Index: python-2.4.6.ebuild |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.6.ebuild,v |
18 |
retrieving revision 1.22 |
19 |
retrieving revision 1.23 |
20 |
diff -u -r1.22 -r1.23 |
21 |
--- python-2.4.6.ebuild 17 Oct 2009 05:03:53 -0000 1.22 |
22 |
+++ python-2.4.6.ebuild 30 Oct 2009 11:45:28 -0000 1.23 |
23 |
@@ -1,6 +1,6 @@ |
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-lang/python/python-2.4.6.ebuild,v 1.22 2009/10/17 05:03:53 arfrever Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.6.ebuild,v 1.23 2009/10/30 11:45:28 arfrever Exp $ |
28 |
|
29 |
EAPI="1" |
30 |
|
31 |
@@ -134,13 +134,6 @@ |
32 |
myconf="--with-cxx=no" |
33 |
fi |
34 |
|
35 |
- # Super-secret switch. Don't use this unless you know what you're |
36 |
- # doing. Enabling UCS2 support will break your existing python |
37 |
- # modules |
38 |
- use ucs2 \ |
39 |
- && myconf+=" --enable-unicode=ucs2" \ |
40 |
- || myconf+=" --enable-unicode=ucs4" |
41 |
- |
42 |
filter-flags -malign-double |
43 |
|
44 |
[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC |
45 |
@@ -173,6 +166,7 @@ |
46 |
--enable-shared \ |
47 |
$(use_enable ipv6) \ |
48 |
$(use_with threads) \ |
49 |
+ $(use ucs2 && echo "--enable-unicode=ucs2" || echo "--enable-unicode=ucs4") \ |
50 |
--infodir='${prefix}'/share/info \ |
51 |
--mandir='${prefix}'/share/man \ |
52 |
--with-libc='' \ |
53 |
@@ -267,20 +261,20 @@ |
54 |
} |
55 |
|
56 |
eselect_python_update() { |
57 |
- local ignored_python_slots |
58 |
- [[ "$(eselect python show)" == "python2."* ]] && ignored_python_slots="--ignore 3.0 --ignore 3.1 --ignore 3.2" |
59 |
+ local ignored_python_slots_options= |
60 |
+ [[ "$(eselect python show)" == "python2."* ]] && ignored_python_slots_options="--ignore 3.0 --ignore 3.1 --ignore 3.2" |
61 |
|
62 |
# Create python2 symlink. |
63 |
eselect python update --ignore 3.0 --ignore 3.1 --ignore 3.2 > /dev/null |
64 |
|
65 |
- eselect python update ${ignored_python_slots} |
66 |
+ eselect python update ${ignored_python_slots_options} |
67 |
} |
68 |
|
69 |
pkg_postinst() { |
70 |
eselect_python_update |
71 |
|
72 |
+ # Python 2.4 partially doesn't respect $(get_libdir). |
73 |
python_mod_optimize -x "(site-packages|test)" /usr/lib/python${PYVER} |
74 |
- [[ "$(get_libdir)" != "lib" ]] && python_mod_optimize -x "(site-packages|test)" /usr/$(get_libdir)/python${PYVER} |
75 |
|
76 |
if [[ "${python_updater_warning}" == "1" ]]; then |
77 |
ewarn |
78 |
@@ -298,6 +292,6 @@ |
79 |
pkg_postrm() { |
80 |
eselect_python_update |
81 |
|
82 |
+ # Python 2.4 partially doesn't respect $(get_libdir). |
83 |
python_mod_cleanup /usr/lib/python${PYVER} |
84 |
- [[ "$(get_libdir)" != "lib" ]] && python_mod_cleanup /usr/$(get_libdir)/python${PYVER} |
85 |
} |
86 |
|
87 |
|
88 |
|
89 |
1.26 dev-lang/python/python-2.5.4-r3.ebuild |
90 |
|
91 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-2.5.4-r3.ebuild?rev=1.26&view=markup |
92 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-2.5.4-r3.ebuild?rev=1.26&content-type=text/plain |
93 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-2.5.4-r3.ebuild?r1=1.25&r2=1.26 |
94 |
|
95 |
Index: python-2.5.4-r3.ebuild |
96 |
=================================================================== |
97 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4-r3.ebuild,v |
98 |
retrieving revision 1.25 |
99 |
retrieving revision 1.26 |
100 |
diff -u -r1.25 -r1.26 |
101 |
--- python-2.5.4-r3.ebuild 17 Oct 2009 05:09:30 -0000 1.25 |
102 |
+++ python-2.5.4-r3.ebuild 30 Oct 2009 11:45:28 -0000 1.26 |
103 |
@@ -1,6 +1,6 @@ |
104 |
# Copyright 1999-2009 Gentoo Foundation |
105 |
# Distributed under the terms of the GNU General Public License v2 |
106 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4-r3.ebuild,v 1.25 2009/10/17 05:09:30 arfrever Exp $ |
107 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4-r3.ebuild,v 1.26 2009/10/30 11:45:28 arfrever Exp $ |
108 |
|
109 |
EAPI="1" |
110 |
|
111 |
@@ -135,15 +135,6 @@ |
112 |
|
113 |
export OPT="${CFLAGS}" |
114 |
|
115 |
- local myconf |
116 |
- |
117 |
- # Super-secret switch. Don't use this unless you know what you're |
118 |
- # doing. Enabling UCS2 support will break your existing python |
119 |
- # modules |
120 |
- use ucs2 \ |
121 |
- && myconf+=" --enable-unicode=ucs2" \ |
122 |
- || myconf+=" --enable-unicode=ucs4" |
123 |
- |
124 |
filter-flags -malign-double |
125 |
|
126 |
[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC |
127 |
@@ -180,10 +171,10 @@ |
128 |
--enable-shared \ |
129 |
$(use_enable ipv6) \ |
130 |
$(use_with threads) \ |
131 |
+ $(use ucs2 && echo "--enable-unicode=ucs2" || echo "--enable-unicode=ucs4") \ |
132 |
--infodir='${prefix}'/share/info \ |
133 |
--mandir='${prefix}'/share/man \ |
134 |
- --with-libc='' \ |
135 |
- ${myconf} |
136 |
+ --with-libc='' |
137 |
} |
138 |
|
139 |
src_compile() { |
140 |
@@ -273,13 +264,13 @@ |
141 |
} |
142 |
|
143 |
eselect_python_update() { |
144 |
- local ignored_python_slots |
145 |
- [[ "$(eselect python show)" == "python2."* ]] && ignored_python_slots="--ignore 3.0 --ignore 3.1 --ignore 3.2" |
146 |
+ local ignored_python_slots_options= |
147 |
+ [[ "$(eselect python show)" == "python2."* ]] && ignored_python_slots_options="--ignore 3.0 --ignore 3.1 --ignore 3.2" |
148 |
|
149 |
# Create python2 symlink. |
150 |
eselect python update --ignore 3.0 --ignore 3.1 --ignore 3.2 > /dev/null |
151 |
|
152 |
- eselect python update ${ignored_python_slots} |
153 |
+ eselect python update ${ignored_python_slots_options} |
154 |
} |
155 |
|
156 |
pkg_postinst() { |
157 |
|
158 |
|
159 |
|
160 |
1.16 dev-lang/python/python-3.1.1-r1.ebuild |
161 |
|
162 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-3.1.1-r1.ebuild?rev=1.16&view=markup |
163 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-3.1.1-r1.ebuild?rev=1.16&content-type=text/plain |
164 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-3.1.1-r1.ebuild?r1=1.15&r2=1.16 |
165 |
|
166 |
Index: python-3.1.1-r1.ebuild |
167 |
=================================================================== |
168 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.1-r1.ebuild,v |
169 |
retrieving revision 1.15 |
170 |
retrieving revision 1.16 |
171 |
diff -u -r1.15 -r1.16 |
172 |
--- python-3.1.1-r1.ebuild 24 Oct 2009 14:35:31 -0000 1.15 |
173 |
+++ python-3.1.1-r1.ebuild 30 Oct 2009 11:45:28 -0000 1.16 |
174 |
@@ -1,6 +1,6 @@ |
175 |
# Copyright 1999-2009 Gentoo Foundation |
176 |
# Distributed under the terms of the GNU General Public License v2 |
177 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.1-r1.ebuild,v 1.15 2009/10/24 14:35:31 alexxy Exp $ |
178 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.1-r1.ebuild,v 1.16 2009/10/30 11:45:28 arfrever Exp $ |
179 |
|
180 |
EAPI="2" |
181 |
|
182 |
@@ -250,21 +250,18 @@ |
183 |
|
184 |
pkg_preinst() { |
185 |
if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version ">=${CATEGORY}/${PN}-${SLOT}_alpha"; then |
186 |
- # Delete this check after global switching to Python 3. |
187 |
- if [[ "$(eselect python show)" == "python3."* ]]; then |
188 |
- python_updater_warning="1" |
189 |
- fi |
190 |
+ python_updater_warning="1" |
191 |
fi |
192 |
} |
193 |
|
194 |
eselect_python_update() { |
195 |
- local ignored_python_slots |
196 |
- [[ "$(eselect python show)" == "python2."* ]] && ignored_python_slots="--ignore 3.0 --ignore 3.1 --ignore 3.2" |
197 |
+ local ignored_python_slots_options= |
198 |
+ [[ "$(eselect python show)" == "python2."* ]] && ignored_python_slots_options="--ignore 3.0 --ignore 3.1 --ignore 3.2" |
199 |
|
200 |
# Create python3 symlink. |
201 |
eselect python update > /dev/null |
202 |
|
203 |
- eselect python update ${ignored_python_slots} |
204 |
+ eselect python update ${ignored_python_slots_options} |
205 |
} |
206 |
|
207 |
pkg_postinst() { |