Gentoo Archives: gentoo-commits

From: Michael Sterrett <mr_bones_@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-engines/renpy/, games-engines/renpy/files/
Date: Tue, 28 Jun 2016 14:41:14
Message-Id: 1467124652.bbc56b4a5abe6a2b84a3283d88b568d37dd5b089.mr_bones_@gentoo
1 commit: bbc56b4a5abe6a2b84a3283d88b568d37dd5b089
2 Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jun 27 21:33:52 2016 +0000
4 Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
5 CommitDate: Tue Jun 28 14:37:32 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbc56b4a
7
8 games-engines/renpy: old
9
10 Package-Manager: portage-2.2.28
11
12 games-engines/renpy/Manifest | 3 -
13 .../renpy/files/renpy-6.15.7-freetype.patch | 29 --
14 .../renpy/files/renpy-6.15.7-multiple-abi.patch | 250 -----------------
15 .../renpy/files/renpy-6.16.5-multiple-abi.patch | 245 -----------------
16 .../renpy/files/renpy-6.18.3-multiple-abi.patch | 271 ------------------
17 .../renpy/files/renpy-6.99.5-multiple-abi.patch | 302 ---------------------
18 games-engines/renpy/renpy-6.15.7.ebuild | 111 --------
19 games-engines/renpy/renpy-6.16.5.ebuild | 110 --------
20 games-engines/renpy/renpy-6.18.3.ebuild | 111 --------
21 9 files changed, 1432 deletions(-)
22
23 diff --git a/games-engines/renpy/Manifest b/games-engines/renpy/Manifest
24 index 98d3b260..4d65ed5 100644
25 --- a/games-engines/renpy/Manifest
26 +++ b/games-engines/renpy/Manifest
27 @@ -1,5 +1,2 @@
28 -DIST renpy-6.15.7-source.tar.bz2 10421736 SHA256 b4280b62f7c8f730a37c7e567b16216b4578fc3640fbcdf5df7c65a73ae52e52 SHA512 d79b1d6b931f281ff208b8ece3889c116ceb05c58fe115e9f7f470788e74e63cfeb3df4f804b4a37a4f1da6ba194c883023808fafc8e8beddf864424958204e6 WHIRLPOOL 202ddb045f440f9abd06f5ac02ebd92a7b0300b14f4755271f1fc4e91bdea21cda19a432f45516f68ba3ad7ead98d7491382ad5c633da277a674f799458795f3
29 -DIST renpy-6.16.5-source.tar.bz2 14455622 SHA256 5ecb00fa84a048ff6e1f1d8a0114373425375e9c0b2a0596bf2d47e996b9d056 SHA512 1a718d86a689135e5a280f64cdc3c0340d712b7804af2169ed4cb4a12528e01088c919b87d36176b3fb8a05e8201f226146c46c4f4d5ebf1d89c3cebd1263c4d WHIRLPOOL b06638c284089ba79d12d95ba604c40fffe595d67e75551bbe8a08ddc57403f1644dd713c5eb15a39fcc34b92722589437935666d172379bb1164d2a02ef9433
30 DIST renpy-6.17.7-source.tar.bz2 17932988 SHA256 fef01de9e482b73d9d409de7a43bada6dd3e2a0549b99dd487306371190ed038 SHA512 22b0e08b18ee35317b11451205233cbd8a29617d9c3d298bbdcfc5757f67c2f0e4c8a748aa83d5c8b43786c062ffca109d07e981efa750fcee26f45f08a33ea2 WHIRLPOOL fef82eb6c958a2525797e5d8bfae3488fba606b70eeed5c94f7afcab4fa46e7a7eb43d91b4bd55f553b65a72b12236e02ecdee55e8852c1fafc055332f9d131d
31 -DIST renpy-6.18.3-source.tar.bz2 23244450 SHA256 c0c6af79ceb529e69cebfdb0e9849e50dc27e424dc2fd2b322c13d6ec938cba6 SHA512 7ea99adaf1fbea7a499790fb5b37349fc797f383fb633956a43955c80885b259e26570469c430f4c4c103e62444f60082690489ee6400809f5e9024693261e55 WHIRLPOOL 6e4e68228bc38c709af4387f209717e4644efccae47fb04b7071783b0c01d6fbe4ca65d7c712a32e159cd59c663873457e54c3851e9e4a84d3d4e4ed05271102
32 DIST renpy-6.99.6-source.tar.bz2 27289290 SHA256 31f3fc84bda7e4048a97539d6266b3fbb18a82fc38db83761dd4771f5ef98d04 SHA512 d018ac0827ee5a914c48479174eccbf3968ea22926638e09ee00ecea49dc0111b4f24810ad32d5a8bb8012ff18e5fb8981705ed0e2289ce3172a1629e095a651 WHIRLPOOL ba8102e11a09b70100d391c5b068c826db810486f2792c5b5214421b09344916888255a377ac26b2b21aaede315bb0470c7315c2581af9e64b545d68ee6f005c
33
34 diff --git a/games-engines/renpy/files/renpy-6.15.7-freetype.patch b/games-engines/renpy/files/renpy-6.15.7-freetype.patch
35 deleted file mode 100644
36 index 7865f0c..0000000
37 --- a/games-engines/renpy/files/renpy-6.15.7-freetype.patch
38 +++ /dev/null
39 @@ -1,29 +0,0 @@
40 -From: Julian Ospald <hasufell@g.o>
41 -Date: Mon Apr 28 22:31:52 UTC 2014
42 -Subject: fix build
43 -
44 ---- renpy-6.14.1-source/module/setup.py
45 -+++ renpy-6.14.1-source/module/setup.py
46 -@@ -24,8 +24,9 @@
47 - include("zlib.h")
48 - include("png.h")
49 - include("SDL.h", directory="SDL")
50 --include("ft2build.h")
51 --include("freetype/freetype.h", directory="freetype2")
52 -+include("ft2build.h") or include("ft2build.h", directory="freetype2")
53 -+include("freetype/freetype.h", directory="freetype2") or include("freetype.h", directory="freetype2")
54 -+include("freetype/ftotval.h", directory="freetype2") or include("ftotval.h", directory="freetype2")
55 - include("libavutil/avstring.h")
56 - include("libavformat/avformat.h")
57 - include("libavcodec/avcodec.h")
58 ---- renpy-6.15.7-source/module/ttgsubtable.h
59 -+++ renpy-6.15.7-source/module/ttgsubtable.h
60 -@@ -3,7 +3,7 @@
61 -
62 - #include <stdint.h>
63 - #include <ft2build.h>
64 --#include <freetype/ftotval.h>
65 -+#include FT_OPENTYPE_VALIDATE_H
66 -
67 - typedef struct
68 - {
69
70 diff --git a/games-engines/renpy/files/renpy-6.15.7-multiple-abi.patch b/games-engines/renpy/files/renpy-6.15.7-multiple-abi.patch
71 deleted file mode 100644
72 index c6b87ac..0000000
73 --- a/games-engines/renpy/files/renpy-6.15.7-multiple-abi.patch
74 +++ /dev/null
75 @@ -1,250 +0,0 @@
76 -commit ea0351d8bf6404f5e8db2ff872885a19bf8a3f92
77 -Author: hasufell <hasufell@g.o>
78 -Date: Thu Jun 27 02:01:17 2013 +0200
79 -
80 - fix multiple abi support
81 -
82 -diff --git a/renpy.py b/renpy.py
83 -index 4ec5324..d873750 100644
84 ---- a/renpy.py
85 -+++ b/renpy.py
86 -@@ -28,82 +28,9 @@
87 - import os
88 - import sys
89 - import warnings
90 --
91 --# Functions to be customized by distributors. ################################
92 --
93 --# Given the Ren'Py base directory (usually the directory containing
94 --# this file), this is expected to return the path to the common directory.
95 --def path_to_common(renpy_base):
96 -- return renpy_base + "/renpy/common"
97 --
98 --# Given a directory holding a Ren'Py game, this is expected to return
99 --# the path to a directory that will hold save files.
100 --def path_to_saves(gamedir):
101 -- import renpy #@UnresolvedImport
102 --
103 -- # Android.
104 -- if renpy.android:
105 -- paths = [
106 -- os.path.join(os.environ["ANDROID_OLD_PUBLIC"], "game/saves"),
107 -- os.path.join(os.environ["ANDROID_PRIVATE"], "saves"),
108 -- os.path.join(os.environ["ANDROID_PUBLIC"], "saves"),
109 -- ]
110 --
111 -- for rv in paths:
112 -- if os.path.isdir(rv):
113 -- break
114 --
115 -- print "Using savedir", rv
116 --
117 -- # We return the last path as the default.
118 --
119 -- return rv
120 --
121 --
122 -- # No save directory given.
123 -- if not renpy.config.save_directory:
124 -- return gamedir + "/saves"
125 --
126 -- # Search the path above Ren'Py for a directory named "Ren'Py Data".
127 -- # If it exists, then use that for our save directory.
128 -- path = renpy.config.renpy_base
129 --
130 -- while True:
131 -- if os.path.isdir(path + "/Ren'Py Data"):
132 -- return path + "/Ren'Py Data/" + renpy.config.save_directory
133 --
134 -- newpath = os.path.dirname(path)
135 -- if path == newpath:
136 -- break
137 -- path = newpath
138 --
139 -- # Otherwise, put the saves in a platform-specific location.
140 -- if renpy.macintosh:
141 -- rv = "~/Library/RenPy/" + renpy.config.save_directory
142 -- return os.path.expanduser(rv)
143 --
144 -- elif renpy.windows:
145 -- if 'APPDATA' in os.environ:
146 -- return os.environ['APPDATA'] + "/RenPy/" + renpy.config.save_directory
147 -- else:
148 -- rv = "~/RenPy/" + renpy.config.save_directory
149 -- return os.path.expanduser(rv)
150 --
151 -- else:
152 -- rv = "~/.renpy/" + renpy.config.save_directory
153 -- return os.path.expanduser(rv)
154 --
155 --
156 --# Returns the path to the Ren'Py base directory (containing common and
157 --# the launcher, usually.)
158 --def path_to_renpy_base():
159 -- renpy_base = os.path.dirname(os.path.realpath(sys.argv[0]))
160 -- renpy_base = os.environ.get('RENPY_BASE', renpy_base)
161 -- renpy_base = os.path.abspath(renpy_base)
162 --
163 -- return renpy_base
164 --
165 --##############################################################################
166 -+from distutils.sysconfig import get_python_lib
167 -+sys.path.append(get_python_lib() + "/renpy@SLOT@")
168 -+import renpy.common as common
169 -
170 - # The version of the Mac Launcher and py4renpy that we require.
171 - macos_version = (6, 14, 0)
172 -@@ -118,20 +45,9 @@ except:
173 - print "Ren'Py requires at least python 2.6."
174 - sys.exit(0)
175 -
176 --android = ("ANDROID_PRIVATE" in os.environ)
177 --
178 --# Android requires us to add code to the main module, and to command some
179 --# renderers.
180 --if android:
181 -- __main__ = sys.modules["__main__"]
182 -- __main__.path_to_renpy_base = path_to_renpy_base
183 -- __main__.path_to_common = path_to_common
184 -- __main__.path_to_saves = path_to_saves
185 -- os.environ["RENPY_RENDERER"] = "gl"
186 --
187 - def main():
188 -
189 -- renpy_base = path_to_renpy_base()
190 -+ renpy_base = common.path_to_renpy_base()
191 -
192 - # Add paths.
193 - if os.path.exists(renpy_base + "/module"):
194 -@@ -154,10 +70,6 @@ def main():
195 - print >>sys.stderr, "correctly, preserving the directory structure."
196 - raise
197 -
198 -- if android:
199 -- renpy.linux = False
200 -- renpy.android = True
201 --
202 - renpy.bootstrap.bootstrap(renpy_base)
203 -
204 - if __name__ == "__main__":
205 -diff --git a/renpy/common.py b/renpy/common.py
206 -new file mode 100644
207 -index 0000000..475b7e8
208 ---- /dev/null
209 -+++ b/renpy/common.py
210 -@@ -0,0 +1,84 @@
211 -+# This file is part of Ren'Py. The license below applies to Ren'Py only.
212 -+# Games and other projects that use Ren'Py may use a different license.
213 -+
214 -+# Copyright 2004-2012 Tom Rothamel <pytom@××××××××.us>
215 -+#
216 -+# Permission is hereby granted, free of charge, to any person
217 -+# obtaining a copy of this software and associated documentation files
218 -+# (the "Software"), to deal in the Software without restriction,
219 -+# including without limitation the rights to use, copy, modify, merge,
220 -+# publish, distribute, sublicense, and/or sell copies of the Software,
221 -+# and to permit persons to whom the Software is furnished to do so,
222 -+# subject to the following conditions:
223 -+#
224 -+# The above copyright notice and this permission notice shall be
225 -+# included in all copies or substantial portions of the Software.
226 -+#
227 -+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
228 -+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
229 -+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
230 -+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
231 -+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
232 -+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
233 -+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
234 -+
235 -+import os
236 -+import sys
237 -+import warnings
238 -+from distutils.sysconfig import get_python_lib
239 -+
240 -+# Functions to be customized by distributors. ################################
241 -+
242 -+# Given the Ren'Py base directory (usually the directory containing
243 -+# this file), this is expected to return the path to the common directory.
244 -+def path_to_common(renpy_base):
245 -+ return renpy_base + "/renpy/common"
246 -+
247 -+# Given a directory holding a Ren'Py game, this is expected to return
248 -+# the path to a directory that will hold save files.
249 -+def path_to_saves(gamedir):
250 -+ import renpy #@UnresolvedImport
251 -+
252 -+ # No save directory given.
253 -+ if not renpy.config.save_directory:
254 -+ return gamedir + "/saves"
255 -+
256 -+ # Search the path above Ren'Py for a directory named "Ren'Py Data".
257 -+ # If it exists, then use that for our save directory.
258 -+ path = renpy.config.renpy_base
259 -+
260 -+ while True:
261 -+ if os.path.isdir(path + "/Ren'Py Data"):
262 -+ return path + "/Ren'Py Data/" + renpy.config.save_directory
263 -+
264 -+ newpath = os.path.dirname(path)
265 -+ if path == newpath:
266 -+ break
267 -+ path = newpath
268 -+
269 -+ # Otherwise, put the saves in a platform-specific location.
270 -+ if renpy.macintosh:
271 -+ rv = "~/Library/RenPy/" + renpy.config.save_directory
272 -+ return os.path.expanduser(rv)
273 -+
274 -+ elif renpy.windows:
275 -+ if 'APPDATA' in os.environ:
276 -+ return os.environ['APPDATA'] + "/RenPy/" + renpy.config.save_directory
277 -+ else:
278 -+ rv = "~/RenPy/" + renpy.config.save_directory
279 -+ return os.path.expanduser(rv)
280 -+
281 -+ else:
282 -+ rv = "~/.renpy/" + renpy.config.save_directory
283 -+ return os.path.expanduser(rv)
284 -+
285 -+
286 -+# Returns the path to the Ren'Py base directory (containing common and
287 -+# the launcher, usually.)
288 -+def path_to_renpy_base():
289 -+ renpy_base = os.path.dirname(os.path.realpath(sys.argv[0]))
290 -+ renpy_base = get_python_lib() + "/renpy@SLOT@"
291 -+ renpy_base = os.environ.get('RENPY_BASE', renpy_base)
292 -+ renpy_base = os.path.abspath(renpy_base)
293 -+
294 -+ return renpy_base
295 -diff --git a/renpy/main.py b/renpy/main.py
296 -index 908e246..61027ec 100644
297 ---- a/renpy/main.py
298 -+++ b/renpy/main.py
299 -@@ -27,7 +27,7 @@ import time
300 - import zipfile
301 - import subprocess
302 - from cPickle import loads, dumps
303 --import __main__
304 -+import renpy.common as common
305 -
306 -
307 - def save_persistent():
308 -@@ -147,7 +147,7 @@ def main():
309 - renpy.config.searchpath = [ renpy.config.gamedir ]
310 -
311 - # Find the common directory.
312 -- commondir = __main__.path_to_common(renpy.config.renpy_base) # E1101 @UndefinedVariable
313 -+ commondir = common.path_to_common(renpy.config.renpy_base) # E1101 @UndefinedVariable
314 -
315 - if os.path.isdir(commondir):
316 - renpy.config.searchpath.append(commondir)
317 -@@ -210,7 +210,7 @@ def main():
318 -
319 - # Find the save directory.
320 - if renpy.config.savedir is None:
321 -- renpy.config.savedir = __main__.path_to_saves(renpy.config.gamedir) # E1101 @UndefinedVariable
322 -+ renpy.config.savedir = common.path_to_saves(renpy.config.gamedir) # E1101 @UndefinedVariable
323 -
324 - if renpy.game.args.savedir: #@UndefinedVariable
325 - renpy.config.savedir = renpy.game.args.savedir #@UndefinedVariable
326
327 diff --git a/games-engines/renpy/files/renpy-6.16.5-multiple-abi.patch b/games-engines/renpy/files/renpy-6.16.5-multiple-abi.patch
328 deleted file mode 100644
329 index a1c5490..0000000
330 --- a/games-engines/renpy/files/renpy-6.16.5-multiple-abi.patch
331 +++ /dev/null
332 @@ -1,245 +0,0 @@
333 -commit 23f67fe23d7b51e352a500a0e005ae3ef4dbc097
334 -Author: hasufell <hasufell@g.o>
335 -Date: Sat Oct 26 22:17:31 2013 +0200
336 -
337 - fix multiple abi support
338 -
339 -diff --git a/renpy.py b/renpy.py
340 -index 9f2977f..394e4e1 100644
341 ---- a/renpy.py
342 -+++ b/renpy.py
343 -@@ -28,82 +28,9 @@
344 - import os
345 - import sys
346 - import warnings
347 --
348 --# Functions to be customized by distributors. ################################
349 --
350 --# Given the Ren'Py base directory (usually the directory containing
351 --# this file), this is expected to return the path to the common directory.
352 --def path_to_common(renpy_base):
353 -- return renpy_base + "/renpy/common"
354 --
355 --# Given a directory holding a Ren'Py game, this is expected to return
356 --# the path to a directory that will hold save files.
357 --def path_to_saves(gamedir):
358 -- import renpy #@UnresolvedImport
359 --
360 -- # Android.
361 -- if renpy.android:
362 -- paths = [
363 -- os.path.join(os.environ["ANDROID_OLD_PUBLIC"], "game/saves"),
364 -- os.path.join(os.environ["ANDROID_PRIVATE"], "saves"),
365 -- os.path.join(os.environ["ANDROID_PUBLIC"], "saves"),
366 -- ]
367 --
368 -- for rv in paths:
369 -- if os.path.isdir(rv):
370 -- break
371 --
372 -- print "Using savedir", rv
373 --
374 -- # We return the last path as the default.
375 --
376 -- return rv
377 --
378 --
379 -- # No save directory given.
380 -- if not renpy.config.save_directory:
381 -- return gamedir + "/saves"
382 --
383 -- # Search the path above Ren'Py for a directory named "Ren'Py Data".
384 -- # If it exists, then use that for our save directory.
385 -- path = renpy.config.renpy_base
386 --
387 -- while True:
388 -- if os.path.isdir(path + "/Ren'Py Data"):
389 -- return path + "/Ren'Py Data/" + renpy.config.save_directory
390 --
391 -- newpath = os.path.dirname(path)
392 -- if path == newpath:
393 -- break
394 -- path = newpath
395 --
396 -- # Otherwise, put the saves in a platform-specific location.
397 -- if renpy.macintosh:
398 -- rv = "~/Library/RenPy/" + renpy.config.save_directory
399 -- return os.path.expanduser(rv)
400 --
401 -- elif renpy.windows:
402 -- if 'APPDATA' in os.environ:
403 -- return os.environ['APPDATA'] + "/RenPy/" + renpy.config.save_directory
404 -- else:
405 -- rv = "~/RenPy/" + renpy.config.save_directory
406 -- return os.path.expanduser(rv)
407 --
408 -- else:
409 -- rv = "~/.renpy/" + renpy.config.save_directory
410 -- return os.path.expanduser(rv)
411 --
412 --
413 --# Returns the path to the Ren'Py base directory (containing common and
414 --# the launcher, usually.)
415 --def path_to_renpy_base():
416 -- renpy_base = os.path.dirname(os.path.realpath(sys.argv[0]))
417 -- renpy_base = os.environ.get('RENPY_BASE', renpy_base)
418 -- renpy_base = os.path.abspath(renpy_base)
419 --
420 -- return renpy_base
421 --
422 --##############################################################################
423 -+from distutils.sysconfig import get_python_lib
424 -+sys.path.append(get_python_lib() + "/renpy@SLOT@")
425 -+import renpy.common as common
426 -
427 - # The version of the Mac Launcher and py4renpy that we require.
428 - macos_version = (6, 14, 0)
429 -@@ -131,7 +58,7 @@ if android:
430 -
431 - def main():
432 -
433 -- renpy_base = path_to_renpy_base()
434 -+ renpy_base = common.path_to_renpy_base()
435 -
436 - # Add paths.
437 - if os.path.exists(renpy_base + "/module"):
438 -diff --git a/renpy/common.py b/renpy/common.py
439 -new file mode 100644
440 -index 0000000..1f15b3c
441 ---- /dev/null
442 -+++ b/renpy/common.py
443 -@@ -0,0 +1,103 @@
444 -+# This file is part of Ren'Py. The license below applies to Ren'Py only.
445 -+# Games and other projects that use Ren'Py may use a different license.
446 -+
447 -+# Copyright 2004-2012 Tom Rothamel <pytom@××××××××.us>
448 -+#
449 -+# Permission is hereby granted, free of charge, to any person
450 -+# obtaining a copy of this software and associated documentation files
451 -+# (the "Software"), to deal in the Software without restriction,
452 -+# including without limitation the rights to use, copy, modify, merge,
453 -+# publish, distribute, sublicense, and/or sell copies of the Software,
454 -+# and to permit persons to whom the Software is furnished to do so,
455 -+# subject to the following conditions:
456 -+#
457 -+# The above copyright notice and this permission notice shall be
458 -+# included in all copies or substantial portions of the Software.
459 -+#
460 -+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
461 -+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
462 -+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
463 -+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
464 -+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
465 -+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
466 -+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
467 -+
468 -+import os
469 -+import sys
470 -+import warnings
471 -+from distutils.sysconfig import get_python_lib
472 -+
473 -+# Functions to be customized by distributors. ################################
474 -+
475 -+# Given the Ren'Py base directory (usually the directory containing
476 -+# this file), this is expected to return the path to the common directory.
477 -+def path_to_common(renpy_base):
478 -+ return renpy_base + "/renpy/common"
479 -+
480 -+# Given a directory holding a Ren'Py game, this is expected to return
481 -+# the path to a directory that will hold save files.
482 -+def path_to_saves(gamedir):
483 -+ import renpy #@UnresolvedImport
484 -+
485 -+ # Android.
486 -+ if renpy.android:
487 -+ paths = [
488 -+ os.path.join(os.environ["ANDROID_OLD_PUBLIC"], "game/saves"),
489 -+ os.path.join(os.environ["ANDROID_PRIVATE"], "saves"),
490 -+ os.path.join(os.environ["ANDROID_PUBLIC"], "saves"),
491 -+ ]
492 -+
493 -+ for rv in paths:
494 -+ if os.path.isdir(rv):
495 -+ break
496 -+
497 -+ print "Using savedir", rv
498 -+
499 -+ # We return the last path as the default.
500 -+
501 -+ return rv
502 -+
503 -+
504 -+ # No save directory given.
505 -+ if not renpy.config.save_directory:
506 -+ return gamedir + "/saves"
507 -+
508 -+ # Search the path above Ren'Py for a directory named "Ren'Py Data".
509 -+ # If it exists, then use that for our save directory.
510 -+ path = renpy.config.renpy_base
511 -+
512 -+ while True:
513 -+ if os.path.isdir(path + "/Ren'Py Data"):
514 -+ return path + "/Ren'Py Data/" + renpy.config.save_directory
515 -+
516 -+ newpath = os.path.dirname(path)
517 -+ if path == newpath:
518 -+ break
519 -+ path = newpath
520 -+
521 -+ # Otherwise, put the saves in a platform-specific location.
522 -+ if renpy.macintosh:
523 -+ rv = "~/Library/RenPy/" + renpy.config.save_directory
524 -+ return os.path.expanduser(rv)
525 -+
526 -+ elif renpy.windows:
527 -+ if 'APPDATA' in os.environ:
528 -+ return os.environ['APPDATA'] + "/RenPy/" + renpy.config.save_directory
529 -+ else:
530 -+ rv = "~/RenPy/" + renpy.config.save_directory
531 -+ return os.path.expanduser(rv)
532 -+
533 -+ else:
534 -+ rv = "~/.renpy/" + renpy.config.save_directory
535 -+ return os.path.expanduser(rv)
536 -+
537 -+
538 -+# Returns the path to the Ren'Py base directory (containing common and
539 -+# the launcher, usually.)
540 -+def path_to_renpy_base():
541 -+ renpy_base = os.path.dirname(os.path.realpath(sys.argv[0]))
542 -+ renpy_base = get_python_lib() + "/renpy@SLOT@"
543 -+ renpy_base = os.environ.get('RENPY_BASE', renpy_base)
544 -+ renpy_base = os.path.abspath(renpy_base)
545 -+
546 -+ return renpy_base
547 -diff --git a/renpy/main.py b/renpy/main.py
548 -index d15eefc..b11bba9 100644
549 ---- a/renpy/main.py
550 -+++ b/renpy/main.py
551 -@@ -26,7 +26,7 @@ import sys
552 - import time
553 - import zipfile
554 - import subprocess
555 --import __main__
556 -+import renpy.common as common
557 -
558 -
559 - def run(restart):
560 -@@ -166,7 +166,7 @@ def main():
561 - renpy.config.searchpath = [ renpy.config.gamedir ]
562 -
563 - # Find the common directory.
564 -- commondir = __main__.path_to_common(renpy.config.renpy_base) # E1101 @UndefinedVariable
565 -+ commondir = common.path_to_common(renpy.config.renpy_base) # E1101 @UndefinedVariable
566 -
567 - if os.path.isdir(commondir):
568 - renpy.config.searchpath.append(commondir)
569 -@@ -229,7 +229,7 @@ def main():
570 -
571 - # Find the save directory.
572 - if renpy.config.savedir is None:
573 -- renpy.config.savedir = __main__.path_to_saves(renpy.config.gamedir) # E1101 @UndefinedVariable
574 -+ renpy.config.savedir = common.path_to_saves(renpy.config.gamedir) # E1101 @UndefinedVariable
575 -
576 - if renpy.game.args.savedir: #@UndefinedVariable
577 - renpy.config.savedir = renpy.game.args.savedir #@UndefinedVariable
578
579 diff --git a/games-engines/renpy/files/renpy-6.18.3-multiple-abi.patch b/games-engines/renpy/files/renpy-6.18.3-multiple-abi.patch
580 deleted file mode 100644
581 index a569fa4..0000000
582 --- a/games-engines/renpy/files/renpy-6.18.3-multiple-abi.patch
583 +++ /dev/null
584 @@ -1,271 +0,0 @@
585 -Author: hasufell <hasufell@g.o>
586 -Date: Tue Jan 21 01:02:00 2014 +0100
587 -
588 - fix multiple abi support
589 -
590 ---- renpy.py
591 -+++ renpy.py
592 -@@ -29,92 +29,9 @@
593 - import sys
594 - import warnings
595 -
596 --# Functions to be customized by distributors. ################################
597 --
598 --# Given the Ren'Py base directory (usually the directory containing
599 --# this file), this is expected to return the path to the common directory.
600 --def path_to_common(renpy_base):
601 -- return renpy_base + "/renpy/common"
602 --
603 --# Given a directory holding a Ren'Py game, this is expected to return
604 --# the path to a directory that will hold save files.
605 --def path_to_saves(gamedir):
606 -- import renpy #@UnresolvedImport
607 --
608 -- # Makes sure the permissions are right on the save directory.
609 -- def test_writable(d):
610 -- try:
611 -- fn = os.path.join(d, "test.txt")
612 -- open(fn, "w").close()
613 -- open(fn, "r").close()
614 -- os.unlink(fn)
615 -- return True
616 -- except:
617 -- return False
618 --
619 --
620 -- # Android.
621 -- if renpy.android:
622 -- paths = [
623 -- os.path.join(os.environ["ANDROID_OLD_PUBLIC"], "game/saves"),
624 -- os.path.join(os.environ["ANDROID_PRIVATE"], "saves"),
625 -- os.path.join(os.environ["ANDROID_PUBLIC"], "saves"),
626 -- ]
627 --
628 -- for rv in paths:
629 -- if os.path.isdir(rv) and test_writable(rv):
630 -- break
631 --
632 -- print "Using savedir", rv
633 --
634 -- # We return the last path as the default.
635 --
636 -- return rv
637 --
638 --
639 -- # No save directory given.
640 -- if not renpy.config.save_directory:
641 -- return gamedir + "/saves"
642 --
643 -- # Search the path above Ren'Py for a directory named "Ren'Py Data".
644 -- # If it exists, then use that for our save directory.
645 -- path = renpy.config.renpy_base
646 --
647 -- while True:
648 -- if os.path.isdir(path + "/Ren'Py Data"):
649 -- return path + "/Ren'Py Data/" + renpy.config.save_directory
650 --
651 -- newpath = os.path.dirname(path)
652 -- if path == newpath:
653 -- break
654 -- path = newpath
655 --
656 -- # Otherwise, put the saves in a platform-specific location.
657 -- if renpy.macintosh:
658 -- rv = "~/Library/RenPy/" + renpy.config.save_directory
659 -- return os.path.expanduser(rv)
660 --
661 -- elif renpy.windows:
662 -- if 'APPDATA' in os.environ:
663 -- return os.environ['APPDATA'] + "/RenPy/" + renpy.config.save_directory
664 -- else:
665 -- rv = "~/RenPy/" + renpy.config.save_directory
666 -- return os.path.expanduser(rv)
667 --
668 -- else:
669 -- rv = "~/.renpy/" + renpy.config.save_directory
670 -- return os.path.expanduser(rv)
671 --
672 --
673 --# Returns the path to the Ren'Py base directory (containing common and
674 --# the launcher, usually.)
675 --def path_to_renpy_base():
676 -- renpy_base = os.path.dirname(os.path.realpath(sys.argv[0]))
677 -- renpy_base = os.path.abspath(renpy_base)
678 --
679 -- return renpy_base
680 --
681 --##############################################################################
682 -+from distutils.sysconfig import get_python_lib
683 -+sys.path.append(get_python_lib() + "/renpy@SLOT@")
684 -+import renpy.common as common
685 -
686 - # The version of the Mac Launcher and py4renpy that we require.
687 - macos_version = (6, 14, 0)
688 -@@ -142,7 +59,7 @@
689 -
690 - def main():
691 -
692 -- renpy_base = path_to_renpy_base()
693 -+ renpy_base = common.path_to_renpy_base()
694 -
695 - # Add paths.
696 - if os.path.exists(renpy_base + "/module"):
697 ---- /dev/null
698 -+++ renpy/common.py
699 -@@ -0,0 +1,127 @@
700 -+# This file is part of Ren'Py. The license below applies to Ren'Py only.
701 -+# Games and other projects that use Ren'Py may use a different license.
702 -+
703 -+# Copyright 2004-2014 Tom Rothamel <pytom@××××××××.us>
704 -+#
705 -+# Permission is hereby granted, free of charge, to any person
706 -+# obtaining a copy of this software and associated documentation files
707 -+# (the "Software"), to deal in the Software without restriction,
708 -+# including without limitation the rights to use, copy, modify, merge,
709 -+# publish, distribute, sublicense, and/or sell copies of the Software,
710 -+# and to permit persons to whom the Software is furnished to do so,
711 -+# subject to the following conditions:
712 -+#
713 -+# The above copyright notice and this permission notice shall be
714 -+# included in all copies or substantial portions of the Software.
715 -+#
716 -+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
717 -+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
718 -+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
719 -+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
720 -+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
721 -+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
722 -+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
723 -+
724 -+import os
725 -+import sys
726 -+import warnings
727 -+from distutils.sysconfig import get_python_lib
728 -+
729 -+# Functions to be customized by distributors. ################################
730 -+
731 -+# Given the Ren'Py base directory (usually the directory containing
732 -+# this file), this is expected to return the path to the common directory.
733 -+def path_to_common(renpy_base):
734 -+ return renpy_base + "/renpy/common"
735 -+
736 -+# Given a directory holding a Ren'Py game, this is expected to return
737 -+# the path to a directory that will hold save files.
738 -+def path_to_saves(gamedir):
739 -+ import renpy #@UnresolvedImport
740 -+
741 -+ # Makes sure the permissions are right on the save directory.
742 -+ def test_writable(d):
743 -+ try:
744 -+ fn = os.path.join(d, "test.txt")
745 -+ open(fn, "w").close()
746 -+ open(fn, "r").close()
747 -+ os.unlink(fn)
748 -+ return True
749 -+ except:
750 -+ return False
751 -+
752 -+
753 -+ # Makes sure the permissions are right on the save directory.
754 -+ def test_writable(d):
755 -+ try:
756 -+ fn = os.path.join(d, "test.txt")
757 -+ open(fn, "w").close()
758 -+ open(fn, "r").close()
759 -+ os.unlink(fn)
760 -+ return True
761 -+ except:
762 -+ return False
763 -+
764 -+
765 -+
766 -+ # Android.
767 -+ if renpy.android:
768 -+ paths = [
769 -+ os.path.join(os.environ["ANDROID_OLD_PUBLIC"], "game/saves"),
770 -+ os.path.join(os.environ["ANDROID_PRIVATE"], "saves"),
771 -+ os.path.join(os.environ["ANDROID_PUBLIC"], "saves"),
772 -+ ]
773 -+
774 -+ for rv in paths:
775 -+ if os.path.isdir(rv) and test_writable(rv):
776 -+ break
777 -+
778 -+ print "Using savedir", rv
779 -+
780 -+ # We return the last path as the default.
781 -+
782 -+ return rv
783 -+
784 -+
785 -+ # No save directory given.
786 -+ if not renpy.config.save_directory:
787 -+ return gamedir + "/saves"
788 -+
789 -+ # Search the path above Ren'Py for a directory named "Ren'Py Data".
790 -+ # If it exists, then use that for our save directory.
791 -+ path = renpy.config.renpy_base
792 -+
793 -+ while True:
794 -+ if os.path.isdir(path + "/Ren'Py Data"):
795 -+ return path + "/Ren'Py Data/" + renpy.config.save_directory
796 -+
797 -+ newpath = os.path.dirname(path)
798 -+ if path == newpath:
799 -+ break
800 -+ path = newpath
801 -+
802 -+ # Otherwise, put the saves in a platform-specific location.
803 -+ if renpy.macintosh:
804 -+ rv = "~/Library/RenPy/" + renpy.config.save_directory
805 -+ return os.path.expanduser(rv)
806 -+
807 -+ elif renpy.windows:
808 -+ if 'APPDATA' in os.environ:
809 -+ return os.environ['APPDATA'] + "/RenPy/" + renpy.config.save_directory
810 -+ else:
811 -+ rv = "~/RenPy/" + renpy.config.save_directory
812 -+ return os.path.expanduser(rv)
813 -+
814 -+ else:
815 -+ rv = "~/.renpy/" + renpy.config.save_directory
816 -+ return os.path.expanduser(rv)
817 -+
818 -+
819 -+# Returns the path to the Ren'Py base directory (containing common and
820 -+# the launcher, usually.)
821 -+def path_to_renpy_base():
822 -+ renpy_base = os.path.dirname(os.path.realpath(sys.argv[0]))
823 -+ renpy_base = get_python_lib() + "/renpy@SLOT@"
824 -+ renpy_base = os.path.abspath(renpy_base)
825 -+
826 -+ return renpy_base
827 ---- renpy/main.py
828 -+++ renpy/main.py
829 -@@ -25,7 +25,7 @@ import os
830 - import sys
831 - import time
832 - import zipfile
833 --import __main__
834 -+import renpy.common as common
835 -
836 -
837 - def run(restart):
838 -@@ -167,7 +167,7 @@ def main():
839 - renpy.config.searchpath = [ renpy.config.gamedir ]
840 -
841 - # Find the common directory.
842 -- commondir = __main__.path_to_common(renpy.config.renpy_base) # E1101 @UndefinedVariable
843 -+ commondir = common.path_to_common(renpy.config.renpy_base) # E1101 @UndefinedVariable
844 -
845 - if os.path.isdir(commondir):
846 - renpy.config.searchpath.append(commondir)
847 -@@ -230,7 +230,7 @@ def main():
848 -
849 - # Find the save directory.
850 - if renpy.config.savedir is None:
851 -- renpy.config.savedir = __main__.path_to_saves(renpy.config.gamedir) # E1101 @UndefinedVariable
852 -+ renpy.config.savedir = common.path_to_saves(renpy.config.gamedir) # E1101 @UndefinedVariable
853 -
854 - if renpy.game.args.savedir: #@UndefinedVariable
855 - renpy.config.savedir = renpy.game.args.savedir #@UndefinedVariable
856
857 diff --git a/games-engines/renpy/files/renpy-6.99.5-multiple-abi.patch b/games-engines/renpy/files/renpy-6.99.5-multiple-abi.patch
858 deleted file mode 100644
859 index 74177fb..0000000
860 --- a/games-engines/renpy/files/renpy-6.99.5-multiple-abi.patch
861 +++ /dev/null
862 @@ -1,302 +0,0 @@
863 -From 9f318ab1a173bc3527c72f2ce9073d4b711559f4 Mon Sep 17 00:00:00 2001
864 -From: hasufell <hasufell@g.o>
865 -Date: Sat, 4 Apr 2015 13:13:18 +0200
866 -Subject: [PATCH] fix multiple abi support
867 -
868 ----
869 - renpy.py | 124 ++------------------------------------------------------
870 - renpy/common.py | 106 ++++++++++++++++++++++++++++++++++++++++++++++++
871 - renpy/main.py | 6 +--
872 - 3 files changed, 113 insertions(+), 123 deletions(-)
873 - create mode 100644 renpy/common.py
874 -
875 -diff --git a/renpy.py b/renpy.py
876 -index b7bc67d..82ea492 100644
877 ---- a/renpy.py
878 -+++ b/renpy.py
879 -@@ -29,114 +29,9 @@ import os
880 - import sys
881 - import warnings
882 -
883 --# Functions to be customized by distributors. ################################
884 --
885 --# Given the Ren'Py base directory (usually the directory containing
886 --# this file), this is expected to return the path to the common directory.
887 --def path_to_common(renpy_base):
888 -- return renpy_base + "/renpy/common"
889 --
890 --# Given a directory holding a Ren'Py game, this is expected to return
891 --# the path to a directory that will hold save files.
892 --def path_to_saves(gamedir):
893 -- import renpy #@UnresolvedImport
894 --
895 -- # Makes sure the permissions are right on the save directory.
896 -- def test_writable(d):
897 -- try:
898 -- fn = os.path.join(d, "test.txt")
899 -- open(fn, "w").close()
900 -- open(fn, "r").close()
901 -- os.unlink(fn)
902 -- return True
903 -- except:
904 -- return False
905 --
906 --
907 -- # Android.
908 -- if renpy.android:
909 -- paths = [
910 -- os.path.join(os.environ["ANDROID_OLD_PUBLIC"], "game/saves"),
911 -- os.path.join(os.environ["ANDROID_PRIVATE"], "saves"),
912 -- os.path.join(os.environ["ANDROID_PUBLIC"], "saves"),
913 -- ]
914 --
915 -- for rv in paths:
916 -- if os.path.isdir(rv) and test_writable(rv):
917 -- break
918 --
919 -- print "Saving to", rv
920 --
921 -- # We return the last path as the default.
922 --
923 -- return rv
924 --
925 -- if renpy.ios:
926 -- from pyobjus import autoclass
927 -- from pyobjus.objc_py_types import enum
928 --
929 -- NSSearchPathDirectory = enum("NSSearchPathDirectory", NSDocumentDirectory=9)
930 -- NSSearchPathDomainMask = enum("NSSearchPathDomainMask", NSUserDomainMask=1)
931 --
932 -- NSFileManager = autoclass('NSFileManager')
933 -- manager = NSFileManager.defaultManager()
934 -- url = manager.URLsForDirectory_inDomains_(
935 -- NSSearchPathDirectory.NSDocumentDirectory,
936 -- NSSearchPathDomainMask.NSUserDomainMask,
937 -- ).lastObject()
938 --
939 -- # url.path seems to change type based on iOS version, for some reason.
940 -- try:
941 -- rv = url.path().UTF8String().decode("utf-8")
942 -- except:
943 -- rv = url.path.UTF8String().decode("utf-8")
944 --
945 -- print "Saving to", rv
946 -- return rv
947 --
948 -- # No save directory given.
949 -- if not renpy.config.save_directory:
950 -- return gamedir + "/saves"
951 --
952 -- # Search the path above Ren'Py for a directory named "Ren'Py Data".
953 -- # If it exists, then use that for our save directory.
954 -- path = renpy.config.renpy_base
955 --
956 -- while True:
957 -- if os.path.isdir(path + "/Ren'Py Data"):
958 -- return path + "/Ren'Py Data/" + renpy.config.save_directory
959 --
960 -- newpath = os.path.dirname(path)
961 -- if path == newpath:
962 -- break
963 -- path = newpath
964 --
965 -- # Otherwise, put the saves in a platform-specific location.
966 -- if renpy.macintosh:
967 -- rv = "~/Library/RenPy/" + renpy.config.save_directory
968 -- return os.path.expanduser(rv)
969 --
970 -- elif renpy.windows:
971 -- if 'APPDATA' in os.environ:
972 -- return os.environ['APPDATA'] + "/RenPy/" + renpy.config.save_directory
973 -- else:
974 -- rv = "~/RenPy/" + renpy.config.save_directory
975 -- return os.path.expanduser(rv)
976 --
977 -- else:
978 -- rv = "~/.renpy/" + renpy.config.save_directory
979 -- return os.path.expanduser(rv)
980 --
981 --
982 --# Returns the path to the Ren'Py base directory (containing common and
983 --# the launcher, usually.)
984 --def path_to_renpy_base():
985 -- renpy_base = os.path.dirname(os.path.realpath(sys.argv[0]))
986 -- renpy_base = os.path.abspath(renpy_base)
987 --
988 -- return renpy_base
989 --
990 --##############################################################################
991 -+from distutils.sysconfig import get_python_lib
992 -+sys.path.append(get_python_lib() + "/renpy@SLOT@")
993 -+import renpy.common as common
994 -
995 - # The version of the Mac Launcher and py4renpy that we require.
996 - macos_version = (6, 14, 0)
997 -@@ -151,20 +46,9 @@ except:
998 - print "Ren'Py requires at least python 2.6."
999 - sys.exit(0)
1000 -
1001 --android = ("ANDROID_PRIVATE" in os.environ)
1002 --
1003 --# Android requires us to add code to the main module, and to command some
1004 --# renderers.
1005 --if android:
1006 -- __main__ = sys.modules["__main__"]
1007 -- __main__.path_to_renpy_base = path_to_renpy_base
1008 -- __main__.path_to_common = path_to_common
1009 -- __main__.path_to_saves = path_to_saves
1010 -- os.environ["RENPY_RENDERER"] = "gl"
1011 --
1012 - def main():
1013 -
1014 -- renpy_base = path_to_renpy_base()
1015 -+ renpy_base = common.path_to_renpy_base()
1016 -
1017 - # Add paths.
1018 - if os.path.exists(renpy_base + "/module"):
1019 -diff --git a/renpy/common.py b/renpy/common.py
1020 -new file mode 100644
1021 -index 0000000..598b16c
1022 ---- /dev/null
1023 -+++ b/renpy/common.py
1024 -@@ -0,0 +1,106 @@
1025 -+# This file is part of Ren'Py. The license below applies to Ren'Py only.
1026 -+# Games and other projects that use Ren'Py may use a different license.
1027 -+
1028 -+# Copyright 2004-2015 Tom Rothamel <pytom@××××××××.us>
1029 -+#
1030 -+# Permission is hereby granted, free of charge, to any person
1031 -+# obtaining a copy of this software and associated documentation files
1032 -+# (the "Software"), to deal in the Software without restriction,
1033 -+# including without limitation the rights to use, copy, modify, merge,
1034 -+# publish, distribute, sublicense, and/or sell copies of the Software,
1035 -+# and to permit persons to whom the Software is furnished to do so,
1036 -+# subject to the following conditions:
1037 -+#
1038 -+# The above copyright notice and this permission notice shall be
1039 -+# included in all copies or substantial portions of the Software.
1040 -+#
1041 -+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
1042 -+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
1043 -+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
1044 -+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
1045 -+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
1046 -+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
1047 -+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1048 -+
1049 -+import os
1050 -+import sys
1051 -+import warnings
1052 -+from distutils.sysconfig import get_python_lib
1053 -+
1054 -+# Functions to be customized by distributors. ################################
1055 -+
1056 -+# Given the Ren'Py base directory (usually the directory containing
1057 -+# this file), this is expected to return the path to the common directory.
1058 -+def path_to_common(renpy_base):
1059 -+ return renpy_base + "/renpy/common"
1060 -+
1061 -+# Given a directory holding a Ren'Py game, this is expected to return
1062 -+# the path to a directory that will hold save files.
1063 -+def path_to_saves(gamedir):
1064 -+ import renpy #@UnresolvedImport
1065 -+
1066 -+ # Makes sure the permissions are right on the save directory.
1067 -+ def test_writable(d):
1068 -+ try:
1069 -+ fn = os.path.join(d, "test.txt")
1070 -+ open(fn, "w").close()
1071 -+ open(fn, "r").close()
1072 -+ os.unlink(fn)
1073 -+ return True
1074 -+ except:
1075 -+ return False
1076 -+
1077 -+
1078 -+ # Makes sure the permissions are right on the save directory.
1079 -+ def test_writable(d):
1080 -+ try:
1081 -+ fn = os.path.join(d, "test.txt")
1082 -+ open(fn, "w").close()
1083 -+ open(fn, "r").close()
1084 -+ os.unlink(fn)
1085 -+ return True
1086 -+ except:
1087 -+ return False
1088 -+
1089 -+ # No save directory given.
1090 -+ if not renpy.config.save_directory:
1091 -+ return gamedir + "/saves"
1092 -+
1093 -+ # Search the path above Ren'Py for a directory named "Ren'Py Data".
1094 -+ # If it exists, then use that for our save directory.
1095 -+ path = renpy.config.renpy_base
1096 -+
1097 -+ while True:
1098 -+ if os.path.isdir(path + "/Ren'Py Data"):
1099 -+ return path + "/Ren'Py Data/" + renpy.config.save_directory
1100 -+
1101 -+ newpath = os.path.dirname(path)
1102 -+ if path == newpath:
1103 -+ break
1104 -+ path = newpath
1105 -+
1106 -+ # Otherwise, put the saves in a platform-specific location.
1107 -+ if renpy.macintosh:
1108 -+ rv = "~/Library/RenPy/" + renpy.config.save_directory
1109 -+ return os.path.expanduser(rv)
1110 -+
1111 -+ elif renpy.windows:
1112 -+ if 'APPDATA' in os.environ:
1113 -+ return os.environ['APPDATA'] + "/RenPy/" + renpy.config.save_directory
1114 -+ else:
1115 -+ rv = "~/RenPy/" + renpy.config.save_directory
1116 -+ return os.path.expanduser(rv)
1117 -+
1118 -+ else:
1119 -+ rv = "~/.renpy/" + renpy.config.save_directory
1120 -+ return os.path.expanduser(rv)
1121 -+
1122 -+
1123 -+# Returns the path to the Ren'Py base directory (containing common and
1124 -+# the launcher, usually.)
1125 -+def path_to_renpy_base():
1126 -+ renpy_base = os.path.dirname(os.path.realpath(sys.argv[0]))
1127 -+ renpy_base = get_python_lib() + "/renpy@SLOT@"
1128 -+ renpy_base = os.path.abspath(renpy_base)
1129 -+
1130 -+ return renpy_base
1131 -diff --git a/renpy/main.py b/renpy/main.py
1132 -index 70372d1..937dd21 100644
1133 ---- a/renpy/main.py
1134 -+++ b/renpy/main.py
1135 -@@ -27,7 +27,7 @@ import os
1136 - import sys
1137 - import time
1138 - import zipfile
1139 --import __main__
1140 -+import renpy.common as common
1141 -
1142 -
1143 - def run(restart):
1144 -@@ -204,7 +204,7 @@ def main():
1145 - renpy.config.searchpath = [ renpy.config.gamedir ]
1146 -
1147 - # Find the common directory.
1148 -- commondir = __main__.path_to_common(renpy.config.renpy_base) # E1101 @UndefinedVariable
1149 -+ commondir = common.path_to_common(renpy.config.renpy_base) # E1101 @UndefinedVariable
1150 -
1151 - if os.path.isdir(commondir):
1152 - renpy.config.searchpath.append(commondir)
1153 -@@ -272,7 +272,7 @@ def main():
1154 -
1155 - # Find the save directory.
1156 - if renpy.config.savedir is None:
1157 -- renpy.config.savedir = __main__.path_to_saves(renpy.config.gamedir) # E1101 @UndefinedVariable
1158 -+ renpy.config.savedir = common.path_to_saves(renpy.config.gamedir) # E1101 @UndefinedVariable
1159 -
1160 - if renpy.game.args.savedir: #@UndefinedVariable
1161 - renpy.config.savedir = renpy.game.args.savedir #@UndefinedVariable
1162 ---
1163 -2.3.1
1164 -
1165
1166 diff --git a/games-engines/renpy/renpy-6.15.7.ebuild b/games-engines/renpy/renpy-6.15.7.ebuild
1167 deleted file mode 100644
1168 index d4f0e70..0000000
1169 --- a/games-engines/renpy/renpy-6.15.7.ebuild
1170 +++ /dev/null
1171 @@ -1,111 +0,0 @@
1172 -# Copyright 1999-2015 Gentoo Foundation
1173 -# Distributed under the terms of the GNU General Public License v2
1174 -# $Id$
1175 -
1176 -EAPI=5
1177 -PYTHON_COMPAT=( python2_7 )
1178 -DISTUTILS_IN_SOURCE_BUILD=1
1179 -inherit eutils toolchain-funcs python-r1 versionator gnome2-utils games distutils-r1
1180 -
1181 -DESCRIPTION="Visual novel engine written in python"
1182 -HOMEPAGE="http://www.renpy.org"
1183 -SRC_URI="http://www.renpy.org/dl/${PV}/${P}-source.tar.bz2"
1184 -
1185 -LICENSE="MIT"
1186 -SLOT="$(get_version_component_range 1-2)"
1187 -MYSLOT=$(delete_all_version_separators ${SLOT})
1188 -KEYWORDS="amd64 x86"
1189 -IUSE="development doc examples"
1190 -REQUIRED_USE="examples? ( development )"
1191 -
1192 -RDEPEND="
1193 - >=app-eselect/eselect-renpy-0.2
1194 - dev-libs/fribidi
1195 - dev-python/pygame[X,${PYTHON_USEDEP}]
1196 - >=dev-lang/python-exec-0.3[${PYTHON_USEDEP}]
1197 - media-libs/glew
1198 - media-libs/libpng:0
1199 - media-libs/libsdl[X,video]
1200 - media-libs/freetype:2
1201 - sys-libs/zlib
1202 - virtual/ffmpeg"
1203 -DEPEND="${RDEPEND}
1204 - virtual/pkgconfig"
1205 -
1206 -S=${WORKDIR}/${P}-source
1207 -
1208 -pkg_setup() {
1209 - games_pkg_setup
1210 - export CFLAGS="${CFLAGS} $($(tc-getPKG_CONFIG) --cflags fribidi)"
1211 -}
1212 -
1213 -python_prepare_all() {
1214 - # wooosh! this should fix multiple abi
1215 - epatch "${FILESDIR}"/${P}-multiple-abi.patch \
1216 - "${FILESDIR}"/${P}-freetype.patch
1217 -
1218 - einfo "Deleting precompiled python files"
1219 - find . -name '*.py[co]' -print -delete || die
1220 -
1221 - sed -i \
1222 - -e "s/@SLOT@/${MYSLOT}/" \
1223 - renpy.py renpy/common.py || die "setting slot failed!"
1224 -
1225 - distutils-r1_python_prepare_all
1226 -}
1227 -
1228 -python_compile() {
1229 - cd "${S}"/module || die
1230 - distutils-r1_python_compile
1231 -}
1232 -
1233 -python_install() {
1234 - cd "${S}"/module || die
1235 - distutils-r1_python_install --install-lib="$(python_get_sitedir)/renpy${MYSLOT}"
1236 -
1237 - cd "${S}" || die
1238 - python_scriptinto "${GAMES_BINDIR}"
1239 - python_newscript renpy.py ${PN}-${SLOT}
1240 -
1241 - python_moduleinto renpy${MYSLOT}
1242 - python_domodule renpy
1243 - if use development ; then
1244 - python_domodule launcher template
1245 - fi
1246 - if use examples ; then
1247 - python_domodule the_question tutorial
1248 - fi
1249 -}
1250 -
1251 -python_install_all() {
1252 - if use development; then
1253 - newicon -s 32 launcher/game/logo32.png ${P}.png
1254 - make_desktop_entry ${PN}-${SLOT} "Ren'Py ${PV}" ${P}
1255 - fi
1256 -
1257 - if use doc; then
1258 - dohtml -r doc
1259 - fi
1260 -
1261 - prepgamesdirs
1262 -}
1263 -
1264 -pkg_preinst() {
1265 - games_pkg_preinst
1266 - use development && gnome2_icon_savelist
1267 -}
1268 -
1269 -pkg_postinst() {
1270 - games_pkg_postinst
1271 - use development && gnome2_icon_cache_update
1272 -
1273 - einfo "running: eselect renpy update --if-unset"
1274 - eselect renpy update --if-unset
1275 -}
1276 -
1277 -pkg_postrm() {
1278 - use development && gnome2_icon_cache_update
1279 -
1280 - einfo "running: eselect renpy update --if-unset"
1281 - eselect renpy update --if-unset
1282 -}
1283
1284 diff --git a/games-engines/renpy/renpy-6.16.5.ebuild b/games-engines/renpy/renpy-6.16.5.ebuild
1285 deleted file mode 100644
1286 index 5cf268b..0000000
1287 --- a/games-engines/renpy/renpy-6.16.5.ebuild
1288 +++ /dev/null
1289 @@ -1,110 +0,0 @@
1290 -# Copyright 1999-2015 Gentoo Foundation
1291 -# Distributed under the terms of the GNU General Public License v2
1292 -# $Id$
1293 -
1294 -EAPI=5
1295 -PYTHON_COMPAT=( python2_7 )
1296 -DISTUTILS_IN_SOURCE_BUILD=1
1297 -inherit eutils toolchain-funcs python-r1 versionator gnome2-utils games distutils-r1
1298 -
1299 -DESCRIPTION="Visual novel engine written in python"
1300 -HOMEPAGE="http://www.renpy.org"
1301 -SRC_URI="http://www.renpy.org/dl/${PV}/${P}-source.tar.bz2"
1302 -
1303 -LICENSE="MIT"
1304 -SLOT="$(get_version_component_range 1-2)"
1305 -MYSLOT=$(delete_all_version_separators ${SLOT})
1306 -KEYWORDS="amd64 x86"
1307 -IUSE="development doc examples"
1308 -REQUIRED_USE="examples? ( development )"
1309 -
1310 -RDEPEND="
1311 - >=app-eselect/eselect-renpy-0.3
1312 - dev-libs/fribidi
1313 - dev-python/pygame[X,${PYTHON_USEDEP}]
1314 - >=dev-lang/python-exec-0.3[${PYTHON_USEDEP}]
1315 - media-libs/glew
1316 - media-libs/libpng:0
1317 - media-libs/libsdl[X,video]
1318 - media-libs/freetype:2
1319 - sys-libs/zlib
1320 - virtual/ffmpeg"
1321 -DEPEND="${RDEPEND}
1322 - virtual/pkgconfig"
1323 -
1324 -S=${WORKDIR}/${P}-source
1325 -
1326 -pkg_setup() {
1327 - games_pkg_setup
1328 - export CFLAGS="${CFLAGS} $($(tc-getPKG_CONFIG) --cflags fribidi)"
1329 -}
1330 -
1331 -python_prepare_all() {
1332 - # wooosh! this should fix multiple abi
1333 - epatch "${FILESDIR}"/${P}-multiple-abi.patch
1334 -
1335 - einfo "Deleting precompiled python files"
1336 - find . -name '*.py[co]' -print -delete || die
1337 -
1338 - sed -i \
1339 - -e "s/@SLOT@/${MYSLOT}/" \
1340 - renpy.py renpy/common.py || die "setting slot failed!"
1341 -
1342 - distutils-r1_python_prepare_all
1343 -}
1344 -
1345 -python_compile() {
1346 - cd "${S}"/module || die
1347 - distutils-r1_python_compile
1348 -}
1349 -
1350 -python_install() {
1351 - cd "${S}"/module || die
1352 - distutils-r1_python_install --install-lib="$(python_get_sitedir)/renpy${MYSLOT}"
1353 -
1354 - cd "${S}" || die
1355 - python_scriptinto "${GAMES_BINDIR}"
1356 - python_newscript renpy.py ${PN}-${SLOT}
1357 -
1358 - python_moduleinto renpy${MYSLOT}
1359 - python_domodule renpy
1360 - if use development ; then
1361 - python_domodule launcher templates
1362 - fi
1363 - if use examples ; then
1364 - python_domodule the_question tutorial
1365 - fi
1366 -}
1367 -
1368 -python_install_all() {
1369 - if use development; then
1370 - newicon -s 32 launcher/game/logo32.png ${P}.png
1371 - make_desktop_entry ${PN}-${SLOT} "Ren'Py ${PV}" ${P}
1372 - fi
1373 -
1374 - if use doc; then
1375 - dohtml -r doc
1376 - fi
1377 -
1378 - prepgamesdirs
1379 -}
1380 -
1381 -pkg_preinst() {
1382 - games_pkg_preinst
1383 - use development && gnome2_icon_savelist
1384 -}
1385 -
1386 -pkg_postinst() {
1387 - games_pkg_postinst
1388 - use development && gnome2_icon_cache_update
1389 -
1390 - einfo "running: eselect renpy update --if-unset"
1391 - eselect renpy update --if-unset
1392 -}
1393 -
1394 -pkg_postrm() {
1395 - use development && gnome2_icon_cache_update
1396 -
1397 - einfo "running: eselect renpy update --if-unset"
1398 - eselect renpy update --if-unset
1399 -}
1400
1401 diff --git a/games-engines/renpy/renpy-6.18.3.ebuild b/games-engines/renpy/renpy-6.18.3.ebuild
1402 deleted file mode 100644
1403 index 0a552af..0000000
1404 --- a/games-engines/renpy/renpy-6.18.3.ebuild
1405 +++ /dev/null
1406 @@ -1,111 +0,0 @@
1407 -# Copyright 1999-2015 Gentoo Foundation
1408 -# Distributed under the terms of the GNU General Public License v2
1409 -# $Id$
1410 -
1411 -EAPI=5
1412 -PYTHON_COMPAT=( python2_7 )
1413 -DISTUTILS_IN_SOURCE_BUILD=1
1414 -inherit eutils toolchain-funcs python-r1 versionator gnome2-utils games distutils-r1
1415 -
1416 -DESCRIPTION="Visual novel engine written in python"
1417 -HOMEPAGE="http://www.renpy.org"
1418 -SRC_URI="http://www.renpy.org/dl/${PV}/${P}-source.tar.bz2"
1419 -
1420 -LICENSE="MIT"
1421 -SLOT="$(get_version_component_range 1-2)"
1422 -MYSLOT=$(delete_all_version_separators ${SLOT})
1423 -KEYWORDS="~amd64 ~x86"
1424 -IUSE="development doc examples"
1425 -REQUIRED_USE="examples? ( development )"
1426 -
1427 -RDEPEND="
1428 - >=app-eselect/eselect-renpy-0.5
1429 - dev-libs/fribidi
1430 - dev-python/pygame[X,${PYTHON_USEDEP}]
1431 - >=dev-lang/python-exec-0.3[${PYTHON_USEDEP}]
1432 - media-libs/glew
1433 - media-libs/libpng:0
1434 - media-libs/libsdl[X,video]
1435 - media-libs/freetype:2
1436 - sys-libs/zlib
1437 - virtual/ffmpeg"
1438 -DEPEND="${RDEPEND}
1439 - dev-python/cython[${PYTHON_USEDEP}]
1440 - virtual/pkgconfig"
1441 -
1442 -S=${WORKDIR}/${P}-source
1443 -
1444 -pkg_setup() {
1445 - games_pkg_setup
1446 - export CFLAGS="${CFLAGS} $($(tc-getPKG_CONFIG) --cflags fribidi)"
1447 -}
1448 -
1449 -python_prepare_all() {
1450 - # wooosh! this should fix multiple abi
1451 - epatch "${FILESDIR}"/${P}-multiple-abi.patch
1452 -
1453 - einfo "Deleting precompiled python files"
1454 - find . -name '*.py[co]' -print -delete || die
1455 -
1456 - sed -i \
1457 - -e "s/@SLOT@/${MYSLOT}/" \
1458 - renpy.py renpy/common.py || die "setting slot failed!"
1459 -
1460 - distutils-r1_python_prepare_all
1461 -}
1462 -
1463 -python_compile() {
1464 - cd "${S}"/module || die
1465 - distutils-r1_python_compile
1466 -}
1467 -
1468 -python_install() {
1469 - cd "${S}"/module || die
1470 - distutils-r1_python_install --install-lib="$(python_get_sitedir)/renpy${MYSLOT}"
1471 -
1472 - cd "${S}" || die
1473 - python_scriptinto "${GAMES_BINDIR}"
1474 - python_newscript renpy.py ${PN}-${SLOT}
1475 -
1476 - python_moduleinto renpy${MYSLOT}
1477 - python_domodule renpy
1478 - if use development ; then
1479 - python_domodule launcher templates
1480 - fi
1481 - if use examples ; then
1482 - python_domodule the_question tutorial
1483 - fi
1484 -}
1485 -
1486 -python_install_all() {
1487 - if use development; then
1488 - newicon -s 32 launcher/game/images/logo32.png ${P}.png
1489 - make_desktop_entry ${PN}-${SLOT} "Ren'Py ${PV}" ${P}
1490 - fi
1491 -
1492 - if use doc; then
1493 - dohtml -r doc
1494 - fi
1495 -
1496 - prepgamesdirs
1497 -}
1498 -
1499 -pkg_preinst() {
1500 - games_pkg_preinst
1501 - use development && gnome2_icon_savelist
1502 -}
1503 -
1504 -pkg_postinst() {
1505 - games_pkg_postinst
1506 - use development && gnome2_icon_cache_update
1507 -
1508 - einfo "running: eselect renpy update --if-unset"
1509 - eselect renpy update --if-unset
1510 -}
1511 -
1512 -pkg_postrm() {
1513 - use development && gnome2_icon_cache_update
1514 -
1515 - einfo "running: eselect renpy update --if-unset"
1516 - eselect renpy update --if-unset
1517 -}