1 |
commit: 88e783e84efbcf2c45c0f52e3dd5756568e73744 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Nov 27 16:47:17 2015 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Nov 27 16:47:17 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/dev/mgorny.git/commit/?id=88e783e8 |
7 |
|
8 |
dev-binpkg/pypy: Remove patches irrelevant to executable |
9 |
|
10 |
....UnixCCompiler.runtime_library_dir_option.patch | 11 - |
11 |
dev-binpkg/pypy/files/1.9-scripts-location.patch | 11 - |
12 |
.../pypy/files/2.5.0_all_distutils_cxx.patch | 324 --------------------- |
13 |
dev-binpkg/pypy/pypy-2.6.0.ebuild | 14 +- |
14 |
dev-binpkg/pypy/pypy-4.0.0.ebuild | 14 +- |
15 |
5 files changed, 4 insertions(+), 370 deletions(-) |
16 |
|
17 |
diff --git a/dev-binpkg/pypy/files/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch b/dev-binpkg/pypy/files/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch |
18 |
deleted file mode 100644 |
19 |
index b3d5235..0000000 |
20 |
--- a/dev-binpkg/pypy/files/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch |
21 |
+++ /dev/null |
22 |
@@ -1,11 +0,0 @@ |
23 |
---- lib-python/2.7/distutils/unixccompiler.py |
24 |
-+++ lib-python/2.7/distutils/unixccompiler.py |
25 |
-@@ -297,7 +297,7 @@ |
26 |
- # this time, there's no way to determine this information from |
27 |
- # the configuration data stored in the Python installation, so |
28 |
- # we use this hack. |
29 |
-- compiler = os.path.basename(sysconfig.get_config_var("CC")) |
30 |
-+ compiler = os.path.basename(self.compiler[0]) |
31 |
- if sys.platform[:6] == "darwin": |
32 |
- # MacOSX's linker doesn't understand the -R flag at all |
33 |
- return "-L" + dir |
34 |
|
35 |
diff --git a/dev-binpkg/pypy/files/1.9-scripts-location.patch b/dev-binpkg/pypy/files/1.9-scripts-location.patch |
36 |
deleted file mode 100644 |
37 |
index 5f0190d..0000000 |
38 |
--- a/dev-binpkg/pypy/files/1.9-scripts-location.patch |
39 |
+++ /dev/null |
40 |
@@ -1,11 +0,0 @@ |
41 |
---- pypy-pypy-release-1.7/lib-python/2.7/distutils/command/install.py |
42 |
-+++ pypy-pypy-release-1.7/lib-python/2.7/distutils/command/install.py |
43 |
-@@ -87,7 +87,7 @@ |
44 |
- 'purelib': '$base/site-packages', |
45 |
- 'platlib': '$base/site-packages', |
46 |
- 'headers': '$base/include', |
47 |
-- 'scripts': '$base/bin', |
48 |
-+ 'scripts': '/usr/bin', |
49 |
- 'data' : '$base', |
50 |
- }, |
51 |
- } |
52 |
|
53 |
diff --git a/dev-binpkg/pypy/files/2.5.0_all_distutils_cxx.patch b/dev-binpkg/pypy/files/2.5.0_all_distutils_cxx.patch |
54 |
deleted file mode 100644 |
55 |
index aa298d0..0000000 |
56 |
--- a/dev-binpkg/pypy/files/2.5.0_all_distutils_cxx.patch |
57 |
+++ /dev/null |
58 |
@@ -1,324 +0,0 @@ |
59 |
-http://bugs.python.org/issue1222585 |
60 |
- |
61 |
---- _osx_support.py |
62 |
-+++ _osx_support.py |
63 |
-@@ -14,13 +14,13 @@ |
64 |
- # configuration variables that may contain universal build flags, |
65 |
- # like "-arch" or "-isdkroot", that may need customization for |
66 |
- # the user environment |
67 |
--_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS', |
68 |
-- 'BLDSHARED', 'LDSHARED', 'CC', 'CXX', |
69 |
-- 'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS', |
70 |
-- 'PY_CORE_CFLAGS') |
71 |
-+_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS', |
72 |
-+ 'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED', |
73 |
-+ 'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS', |
74 |
-+ 'PY_CPPFLAGS', 'PY_CORE_CFLAGS') |
75 |
- |
76 |
- # configuration variables that may contain compiler calls |
77 |
--_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX') |
78 |
-+_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX') |
79 |
- |
80 |
- # prefix added to original configuration variable names |
81 |
- _INITPRE = '_OSX_SUPPORT_INITIAL_' |
82 |
---- distutils/sysconfig_pypy.py |
83 |
-+++ distutils/sysconfig_pypy.py |
84 |
-@@ -123,7 +123,55 @@ |
85 |
- optional C speedup components. |
86 |
- """ |
87 |
- if compiler.compiler_type == "unix": |
88 |
-- compiler.compiler_so.extend(['-O2', '-fPIC', '-Wimplicit']) |
89 |
-+ cc = ' '.join(compiler.compiler) |
90 |
-+ cxx = ' '.join(compiler.compiler_cxx) |
91 |
-+ ldshared = ' '.join(compiler.linker_so) |
92 |
-+ ldcxxshared = ' '.join(compiler.linker_so_cxx) |
93 |
-+ |
94 |
-+ cflags = '' |
95 |
-+ cxxflags = '' |
96 |
-+ ccshared = '-fPIC' |
97 |
-+ |
98 |
-+ if 'CC' in os.environ: |
99 |
-+ cc = os.environ['CC'] |
100 |
-+ if 'CXX' in os.environ: |
101 |
-+ cxx = os.environ['CXX'] |
102 |
-+ if 'LDSHARED' in os.environ: |
103 |
-+ ldshared = os.environ['LDSHARED'] |
104 |
-+ if 'LDCXXSHARED' in os.environ: |
105 |
-+ ldcxxshared = os.environ['LDCXXSHARED'] |
106 |
-+ if 'CPP' in os.environ: |
107 |
-+ cpp = os.environ['CPP'] |
108 |
-+ else: |
109 |
-+ cpp = cc + " -E" # not always |
110 |
-+ if 'LDFLAGS' in os.environ: |
111 |
-+ ldshared = ldshared + ' ' + os.environ['LDFLAGS'] |
112 |
-+ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS'] |
113 |
-+ if 'CFLAGS' in os.environ: |
114 |
-+ cflags = os.environ['CFLAGS'] |
115 |
-+ ldshared = ldshared + ' ' + os.environ['CFLAGS'] |
116 |
-+ if 'CXXFLAGS' in os.environ: |
117 |
-+ cxxflags = os.environ['CXXFLAGS'] |
118 |
-+ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS'] |
119 |
-+ if 'CPPFLAGS' in os.environ: |
120 |
-+ cpp = cpp + ' ' + os.environ['CPPFLAGS'] |
121 |
-+ cflags = cflags + ' ' + os.environ['CPPFLAGS'] |
122 |
-+ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS'] |
123 |
-+ ldshared = ldshared + ' ' + os.environ['CPPFLAGS'] |
124 |
-+ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS'] |
125 |
-+ |
126 |
-+ cc_cmd = cc + ' ' + cflags |
127 |
-+ cxx_cmd = cxx + ' ' + cxxflags |
128 |
-+ compiler.set_executables( |
129 |
-+ preprocessor=cpp, |
130 |
-+ compiler=cc_cmd, |
131 |
-+ compiler_so=cc_cmd + ' ' + ccshared, |
132 |
-+ compiler_cxx=cxx_cmd, |
133 |
-+ compiler_so_cxx=cxx_cmd + ' ' + ccshared, |
134 |
-+ linker_so=ldshared, |
135 |
-+ linker_exe=cc, |
136 |
-+ linker_so_cxx=ldcxxshared, |
137 |
-+ linker_exe_cxx=cxx) |
138 |
- compiler.shared_lib_extension = get_config_var('SO') |
139 |
- if "CPPFLAGS" in os.environ: |
140 |
- cppflags = shlex.split(os.environ["CPPFLAGS"]) |
141 |
---- distutils/cygwinccompiler.py |
142 |
-+++ distutils/cygwinccompiler.py |
143 |
-@@ -117,8 +117,10 @@ |
144 |
- # dllwrap 2.10.90 is buggy |
145 |
- if self.ld_version >= "2.10.90": |
146 |
- self.linker_dll = "gcc" |
147 |
-+ self.linker_dll_cxx = "g++" |
148 |
- else: |
149 |
- self.linker_dll = "dllwrap" |
150 |
-+ self.linker_dll_cxx = "dllwrap" |
151 |
- |
152 |
- # ld_version >= "2.13" support -shared so use it instead of |
153 |
- # -mdll -static |
154 |
-@@ -132,9 +134,13 @@ |
155 |
- self.set_executables(compiler='gcc -mcygwin -O -Wall', |
156 |
- compiler_so='gcc -mcygwin -mdll -O -Wall', |
157 |
- compiler_cxx='g++ -mcygwin -O -Wall', |
158 |
-+ compiler_so_cxx='g++ -mcygwin -mdll -O -Wall', |
159 |
- linker_exe='gcc -mcygwin', |
160 |
- linker_so=('%s -mcygwin %s' % |
161 |
-- (self.linker_dll, shared_option))) |
162 |
-+ (self.linker_dll, shared_option)), |
163 |
-+ linker_exe_cxx='g++ -mcygwin', |
164 |
-+ linker_so_cxx=('%s -mcygwin %s' % |
165 |
-+ (self.linker_dll_cxx, shared_option))) |
166 |
- |
167 |
- # cygwin and mingw32 need different sets of libraries |
168 |
- if self.gcc_version == "2.91.57": |
169 |
-@@ -160,8 +166,12 @@ |
170 |
- raise CompileError, msg |
171 |
- else: # for other files use the C-compiler |
172 |
- try: |
173 |
-- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + |
174 |
-- extra_postargs) |
175 |
-+ if self.detect_language(src) == 'c++': |
176 |
-+ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] + |
177 |
-+ extra_postargs) |
178 |
-+ else: |
179 |
-+ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + |
180 |
-+ extra_postargs) |
181 |
- except DistutilsExecError, msg: |
182 |
- raise CompileError, msg |
183 |
- |
184 |
-@@ -327,9 +337,14 @@ |
185 |
- self.set_executables(compiler='gcc%s -O -Wall' % no_cygwin, |
186 |
- compiler_so='gcc%s -mdll -O -Wall' % no_cygwin, |
187 |
- compiler_cxx='g++%s -O -Wall' % no_cygwin, |
188 |
-+ compiler_so_cxx='g++%s -mdll -O -Wall' % no_cygwin, |
189 |
- linker_exe='gcc%s' % no_cygwin, |
190 |
- linker_so='%s%s %s %s' |
191 |
- % (self.linker_dll, no_cygwin, |
192 |
-+ shared_option, entry_point), |
193 |
-+ linker_exe_cxx='g++%s' % no_cygwin, |
194 |
-+ linker_so_cxx='%s%s %s %s' |
195 |
-+ % (self.linker_dll_cxx, no_cygwin, |
196 |
- shared_option, entry_point)) |
197 |
- # Maybe we should also append -mthreads, but then the finished |
198 |
- # dlls need another dll (mingwm10.dll see Mingw32 docs) |
199 |
-http://bugs.python.org/issue1222585 |
200 |
- |
201 |
---- distutils/emxccompiler.py |
202 |
-+++ distutils/emxccompiler.py |
203 |
-@@ -65,8 +65,12 @@ |
204 |
- # XXX optimization, warnings etc. should be customizable. |
205 |
- self.set_executables(compiler='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall', |
206 |
- compiler_so='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall', |
207 |
-+ compiler_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall', |
208 |
-+ compiler_so_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall', |
209 |
- linker_exe='gcc -Zomf -Zmt -Zcrtdll', |
210 |
-- linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll') |
211 |
-+ linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll', |
212 |
-+ linker_exe_cxx='g++ -Zomf -Zmt -Zcrtdll', |
213 |
-+ linker_so_cxx='g++ -Zomf -Zmt -Zcrtdll -Zdll') |
214 |
- |
215 |
- # want the gcc library statically linked (so that we don't have |
216 |
- # to distribute a version dependent on the compiler we have) |
217 |
-@@ -83,8 +87,12 @@ |
218 |
- raise CompileError, msg |
219 |
- else: # for other files use the C-compiler |
220 |
- try: |
221 |
-- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + |
222 |
-- extra_postargs) |
223 |
-+ if self.detect_language(src) == 'c++': |
224 |
-+ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] + |
225 |
-+ extra_postargs) |
226 |
-+ else: |
227 |
-+ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + |
228 |
-+ extra_postargs) |
229 |
- except DistutilsExecError, msg: |
230 |
- raise CompileError, msg |
231 |
- |
232 |
---- distutils/sysconfig_cpython.py |
233 |
-+++ distutils/sysconfig_cpython.py |
234 |
-@@ -170,10 +170,12 @@ |
235 |
- _osx_support.customize_compiler(_config_vars) |
236 |
- _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True' |
237 |
- |
238 |
-- (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \ |
239 |
-- get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS', |
240 |
-- 'CCSHARED', 'LDSHARED', 'SO', 'AR', |
241 |
-- 'ARFLAGS') |
242 |
-+ (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \ |
243 |
-+ get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED', |
244 |
-+ 'SO', 'AR', 'ARFLAGS') |
245 |
-+ |
246 |
-+ cflags = '' |
247 |
-+ cxxflags = '' |
248 |
- |
249 |
- if 'CC' in os.environ: |
250 |
- newcc = os.environ['CC'] |
251 |
-@@ -188,19 +190,27 @@ |
252 |
- cxx = os.environ['CXX'] |
253 |
- if 'LDSHARED' in os.environ: |
254 |
- ldshared = os.environ['LDSHARED'] |
255 |
-+ if 'LDCXXSHARED' in os.environ: |
256 |
-+ ldcxxshared = os.environ['LDCXXSHARED'] |
257 |
- if 'CPP' in os.environ: |
258 |
- cpp = os.environ['CPP'] |
259 |
- else: |
260 |
- cpp = cc + " -E" # not always |
261 |
- if 'LDFLAGS' in os.environ: |
262 |
- ldshared = ldshared + ' ' + os.environ['LDFLAGS'] |
263 |
-+ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS'] |
264 |
- if 'CFLAGS' in os.environ: |
265 |
-- cflags = opt + ' ' + os.environ['CFLAGS'] |
266 |
-+ cflags = os.environ['CFLAGS'] |
267 |
- ldshared = ldshared + ' ' + os.environ['CFLAGS'] |
268 |
-+ if 'CXXFLAGS' in os.environ: |
269 |
-+ cxxflags = os.environ['CXXFLAGS'] |
270 |
-+ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS'] |
271 |
- if 'CPPFLAGS' in os.environ: |
272 |
- cpp = cpp + ' ' + os.environ['CPPFLAGS'] |
273 |
- cflags = cflags + ' ' + os.environ['CPPFLAGS'] |
274 |
-+ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS'] |
275 |
- ldshared = ldshared + ' ' + os.environ['CPPFLAGS'] |
276 |
-+ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS'] |
277 |
- if 'AR' in os.environ: |
278 |
- ar = os.environ['AR'] |
279 |
- if 'ARFLAGS' in os.environ: |
280 |
-@@ -209,13 +219,17 @@ |
281 |
- archiver = ar + ' ' + ar_flags |
282 |
- |
283 |
- cc_cmd = cc + ' ' + cflags |
284 |
-+ cxx_cmd = cxx + ' ' + cxxflags |
285 |
- compiler.set_executables( |
286 |
- preprocessor=cpp, |
287 |
- compiler=cc_cmd, |
288 |
- compiler_so=cc_cmd + ' ' + ccshared, |
289 |
-- compiler_cxx=cxx, |
290 |
-+ compiler_cxx=cxx_cmd, |
291 |
-+ compiler_so_cxx=cxx_cmd + ' ' + ccshared, |
292 |
- linker_so=ldshared, |
293 |
- linker_exe=cc, |
294 |
-+ linker_so_cxx=ldcxxshared, |
295 |
-+ linker_exe_cxx=cxx, |
296 |
- archiver=archiver) |
297 |
- |
298 |
- compiler.shared_lib_extension = so_ext |
299 |
---- distutils/unixccompiler.py |
300 |
-+++ distutils/unixccompiler.py |
301 |
-@@ -55,14 +55,17 @@ |
302 |
- # are pretty generic; they will probably have to be set by an outsider |
303 |
- # (eg. using information discovered by the sysconfig about building |
304 |
- # Python extensions). |
305 |
-- executables = {'preprocessor' : None, |
306 |
-- 'compiler' : ["cc"], |
307 |
-- 'compiler_so' : ["cc"], |
308 |
-- 'compiler_cxx' : ["c++"], # pypy: changed, 'cc' is bogus |
309 |
-- 'linker_so' : ["cc", "-shared"], |
310 |
-- 'linker_exe' : ["cc"], |
311 |
-- 'archiver' : ["ar", "-cr"], |
312 |
-- 'ranlib' : None, |
313 |
-+ executables = {'preprocessor' : None, |
314 |
-+ 'compiler' : ["cc"], |
315 |
-+ 'compiler_so' : ["cc"], |
316 |
-+ 'compiler_cxx' : ["c++"], |
317 |
-+ 'compiler_so_cxx' : ["c++"], |
318 |
-+ 'linker_so' : ["cc", "-shared"], |
319 |
-+ 'linker_exe' : ["cc"], |
320 |
-+ 'linker_so_cxx' : ["c++", "-shared"], |
321 |
-+ 'linker_exe_cxx' : ["c++"], |
322 |
-+ 'archiver' : ["ar", "-cr"], |
323 |
-+ 'ranlib' : None, |
324 |
- } |
325 |
- |
326 |
- if sys.platform[:6] == "darwin": |
327 |
-@@ -112,12 +115,19 @@ |
328 |
- |
329 |
- def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts): |
330 |
- compiler_so = self.compiler_so |
331 |
-+ compiler_so_cxx = self.compiler_so_cxx |
332 |
- if sys.platform == 'darwin': |
333 |
- compiler_so = _osx_support.compiler_fixup(compiler_so, |
334 |
- cc_args + extra_postargs) |
335 |
-+ compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx, |
336 |
-+ cc_args + extra_postargs) |
337 |
- try: |
338 |
-- self.spawn(compiler_so + cc_args + [src, '-o', obj] + |
339 |
-- extra_postargs) |
340 |
-+ if self.detect_language(src) == 'c++': |
341 |
-+ self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] + |
342 |
-+ extra_postargs) |
343 |
-+ else: |
344 |
-+ self.spawn(compiler_so + cc_args + [src, '-o', obj] + |
345 |
-+ extra_postargs) |
346 |
- except DistutilsExecError, msg: |
347 |
- raise CompileError, msg |
348 |
- |
349 |
-@@ -174,23 +184,16 @@ |
350 |
- ld_args.extend(extra_postargs) |
351 |
- self.mkpath(os.path.dirname(output_filename)) |
352 |
- try: |
353 |
-- if target_desc == CCompiler.EXECUTABLE: |
354 |
-- linker = self.linker_exe[:] |
355 |
-+ if target_lang == "c++": |
356 |
-+ if target_desc == CCompiler.EXECUTABLE: |
357 |
-+ linker = self.linker_exe_cxx[:] |
358 |
-+ else: |
359 |
-+ linker = self.linker_so_cxx[:] |
360 |
- else: |
361 |
-- linker = self.linker_so[:] |
362 |
-- if target_lang == "c++" and self.compiler_cxx: |
363 |
-- # skip over environment variable settings if /usr/bin/env |
364 |
-- # is used to set up the linker's environment. |
365 |
-- # This is needed on OSX. Note: this assumes that the |
366 |
-- # normal and C++ compiler have the same environment |
367 |
-- # settings. |
368 |
-- i = 0 |
369 |
-- if os.path.basename(linker[0]) == "env": |
370 |
-- i = 1 |
371 |
-- while '=' in linker[i]: |
372 |
-- i = i + 1 |
373 |
-- |
374 |
-- linker[i] = self.compiler_cxx[i] |
375 |
-+ if target_desc == CCompiler.EXECUTABLE: |
376 |
-+ linker = self.linker_exe[:] |
377 |
-+ else: |
378 |
-+ linker = self.linker_so[:] |
379 |
- |
380 |
- if sys.platform == 'darwin': |
381 |
- linker = _osx_support.compiler_fixup(linker, ld_args) |
382 |
- |
383 |
|
384 |
diff --git a/dev-binpkg/pypy/pypy-2.6.0.ebuild b/dev-binpkg/pypy/pypy-2.6.0.ebuild |
385 |
index c15baca..0c8b627 100644 |
386 |
--- a/dev-binpkg/pypy/pypy-2.6.0.ebuild |
387 |
+++ b/dev-binpkg/pypy/pypy-2.6.0.ebuild |
388 |
@@ -11,8 +11,7 @@ CPY_PATCHSET_VERSION="2.7.10-0" |
389 |
|
390 |
DESCRIPTION="A fast, compliant alternative implementation of the Python language" |
391 |
HOMEPAGE="http://pypy.org/" |
392 |
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${P}-src.tar.bz2 |
393 |
- http://dev.gentoo.org/~floppym/python/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz" |
394 |
+SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${P}-src.tar.bz2" |
395 |
|
396 |
LICENSE="MIT" |
397 |
SLOT="0/$(get_version_component_range 1-2 ${PV})" |
398 |
@@ -95,16 +94,7 @@ pkg_setup() { |
399 |
} |
400 |
|
401 |
src_prepare() { |
402 |
- epatch "${FILESDIR}/1.9-scripts-location.patch" \ |
403 |
- "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch" \ |
404 |
- "${FILESDIR}"/2.5.0-shared-lib.patch # 517002 |
405 |
- |
406 |
- # apply CPython stdlib patches |
407 |
- pushd lib-python/2.7 > /dev/null || die |
408 |
- epatch "${FILESDIR}"/2.5.0_all_distutils_cxx.patch \ |
409 |
- "${WORKDIR}"/patches/22_all_turkish_locale.patch \ |
410 |
- "${WORKDIR}"/patches/62_all_xml.use_pyxml.patch |
411 |
- popd > /dev/null || die |
412 |
+ epatch "${FILESDIR}"/2.5.0-shared-lib.patch # 517002 |
413 |
|
414 |
epatch_user |
415 |
} |
416 |
|
417 |
diff --git a/dev-binpkg/pypy/pypy-4.0.0.ebuild b/dev-binpkg/pypy/pypy-4.0.0.ebuild |
418 |
index c15baca..0c8b627 100644 |
419 |
--- a/dev-binpkg/pypy/pypy-4.0.0.ebuild |
420 |
+++ b/dev-binpkg/pypy/pypy-4.0.0.ebuild |
421 |
@@ -11,8 +11,7 @@ CPY_PATCHSET_VERSION="2.7.10-0" |
422 |
|
423 |
DESCRIPTION="A fast, compliant alternative implementation of the Python language" |
424 |
HOMEPAGE="http://pypy.org/" |
425 |
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${P}-src.tar.bz2 |
426 |
- http://dev.gentoo.org/~floppym/python/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz" |
427 |
+SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${P}-src.tar.bz2" |
428 |
|
429 |
LICENSE="MIT" |
430 |
SLOT="0/$(get_version_component_range 1-2 ${PV})" |
431 |
@@ -95,16 +94,7 @@ pkg_setup() { |
432 |
} |
433 |
|
434 |
src_prepare() { |
435 |
- epatch "${FILESDIR}/1.9-scripts-location.patch" \ |
436 |
- "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch" \ |
437 |
- "${FILESDIR}"/2.5.0-shared-lib.patch # 517002 |
438 |
- |
439 |
- # apply CPython stdlib patches |
440 |
- pushd lib-python/2.7 > /dev/null || die |
441 |
- epatch "${FILESDIR}"/2.5.0_all_distutils_cxx.patch \ |
442 |
- "${WORKDIR}"/patches/22_all_turkish_locale.patch \ |
443 |
- "${WORKDIR}"/patches/62_all_xml.use_pyxml.patch |
444 |
- popd > /dev/null || die |
445 |
+ epatch "${FILESDIR}"/2.5.0-shared-lib.patch # 517002 |
446 |
|
447 |
epatch_user |
448 |
} |