summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Ospald <hasufell@gentoo.org>2013-06-27 00:07:25 +0000
committerJulian Ospald <hasufell@gentoo.org>2013-06-27 00:07:25 +0000
commit9fdac5f4da8aaec39e2c7f583f2c79477d7c2b07 (patch)
tree3f4d6f3100ffd97e189b2f7164747c36a50592c9 /games-engines
parentadded missing patch (diff)
downloadhistorical-9fdac5f4da8aaec39e2c7f583f2c79477d7c2b07.tar.gz
historical-9fdac5f4da8aaec39e2c7f583f2c79477d7c2b07.tar.bz2
historical-9fdac5f4da8aaec39e2c7f583f2c79477d7c2b07.zip
version bump, remove old
Package-Manager: portage-2.2.0_alpha185/cvs/Linux x86_64 Manifest-Sign-Key: 0xE73C35B3
Diffstat (limited to 'games-engines')
-rw-r--r--games-engines/renpy/ChangeLog9
-rw-r--r--games-engines/renpy/Manifest24
-rw-r--r--games-engines/renpy/files/renpy-6.15.7-multiple-abi.patch (renamed from games-engines/renpy/files/renpy-6.15.5-multiple-abi.patch)235
-rw-r--r--games-engines/renpy/renpy-6.15.7.ebuild (renamed from games-engines/renpy/renpy-6.15.5.ebuild)2
4 files changed, 154 insertions, 116 deletions
diff --git a/games-engines/renpy/ChangeLog b/games-engines/renpy/ChangeLog
index b3b2dcae1093..724f75dd206c 100644
--- a/games-engines/renpy/ChangeLog
+++ b/games-engines/renpy/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for games-engines/renpy
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/renpy/ChangeLog,v 1.15 2013/06/05 12:27:29 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/renpy/ChangeLog,v 1.16 2013/06/27 00:07:21 hasufell Exp $
+
+*renpy-6.15.7 (27 Jun 2013)
+
+ 27 Jun 2013; Julian Ospald <hasufell@gentoo.org> -renpy-6.15.5.ebuild,
+ -files/renpy-6.15.5-multiple-abi.patch, +renpy-6.15.7.ebuild,
+ +files/renpy-6.15.7-multiple-abi.patch:
+ version bump, remove old
*renpy-6.15.5 (05 Jun 2013)
diff --git a/games-engines/renpy/Manifest b/games-engines/renpy/Manifest
index f166ae816aee..4801848cfcf8 100644
--- a/games-engines/renpy/Manifest
+++ b/games-engines/renpy/Manifest
@@ -5,23 +5,23 @@ AUX renpy-6.14.1-av_close_input_stream.patch 291 SHA256 da5d69dadb0c8559f20b2059
AUX renpy-6.14.1-multiple-abi.patch 7950 SHA256 7605357e2fb692acc0032380ebaff4d153d4cae139b8b6298cbcd347f8880838 SHA512 1673cb44bb168745b6eeb770ca4bc88ca0c72ded4e325bedb5fb5ea90147276bfe63bd5607441560e5aa1dbaf93820fe3e77f853716b24f5eaa80ad8ab2e9008 WHIRLPOOL 330aa2c6ed0a5f54f8523fffbc5f503d7497f756c776620d91981be89d90737f16114b331662ce300720039b847d34d3df13dd19c039e7dca851784a962d0722
AUX renpy-6.14.1-remove-AVFormatParameters.patch 494 SHA256 3e67e752def86a848d6a9e4a7d20c8dd3bf4158a1288065ec1f21278a4c626e2 SHA512 6589c26dfb746aa23196ad0f5a74854ef7d7916fa48298794c9d6a146865cb124c9d1b22c922d57202de87c32487706c45d3a73c90fa9035afae6604a05de75e WHIRLPOOL 6fb36d076c891b2c2e8fa6b2af548de73a575e91037fa9b4cb4f77f74262e714f499a72a93c3d1756aabed80b336dd7bbd27a3b939eb83c76453ef52a41cbe68
AUX renpy-6.15.4-multiple-abi.patch 7631 SHA256 c75d7096b7630f72a49610a38953fe504fd6e625999b3b015d367ffc577f484d SHA512 07193f29a32ae58f94d023b054a1514c30c6d08696a650c68e40c53bf9658c895718f295cab845e1ef6681c7780d5d5f05173b7914eb8dcebbbc7cdd98f5ee2f WHIRLPOOL 22985e44e1805f6b64b31c1516bddaf2cdc6474ec418002d180155cf65e338018de7f01f6d0c62adc55e8ff766ab5d02f802c40275379af121e0259ae74b3c37
-AUX renpy-6.15.5-multiple-abi.patch 7631 SHA256 c75d7096b7630f72a49610a38953fe504fd6e625999b3b015d367ffc577f484d SHA512 07193f29a32ae58f94d023b054a1514c30c6d08696a650c68e40c53bf9658c895718f295cab845e1ef6681c7780d5d5f05173b7914eb8dcebbbc7cdd98f5ee2f WHIRLPOOL 22985e44e1805f6b64b31c1516bddaf2cdc6474ec418002d180155cf65e338018de7f01f6d0c62adc55e8ff766ab5d02f802c40275379af121e0259ae74b3c37
+AUX renpy-6.15.7-multiple-abi.patch 8641 SHA256 a93776659e1292bdd41a8d4ff38d0720c3d85103326abbab6322e9175f599305 SHA512 626fe08565e226473180e51e54b650f336f71e57c71a99bda3d0e55e2115863169bd39d8d8e706f787275b81345b553c104f21a6d71ebadee017bda13826bda3 WHIRLPOOL 640bae68cc1e5c7ad2781a93e050d4b4fc3e7ec564224a1014787f5f8b0d19ab5202d7924b7e308c0e6e09a3487c707aa372794c0f5b42cd9d45954d93f3beef
DIST renpy-6.14.1-source.tar.bz2 9806538 SHA256 18be3630d1956131a1f010732d15292cdcec14a2391210af27dc342fafd8197f SHA512 a1f13a5f860e66054012eab29bbd37715bd9721e2dc30fdd9c8d4d8c58dc672c35b3c813e962ad6878cb741502af5a181dff8a05f359892b6b60d2e15bc5a7bc WHIRLPOOL 54018731e136106f328bf2d028841f09424d8ffd8303821eec995c55918b2c8ac7eb97d9ed24785e95ad3d878b794f5bcf96cc9f783955f8d1ace086a3ca9b61
DIST renpy-6.15.4-source.tar.bz2 10393987 SHA256 1c32fef5fda6f14134ea5e18f4754934644f86bdd968b4600b03b373f2d8e9cb SHA512 d68d5d64b29bf3eb19a38aa9dc540278e0b054dc2629aaa01866fbf2976cc6a5ffb0027706004526112782b25d0a8aae76a6b3958b5bfdac8a62841ba223554a WHIRLPOOL 008e1e3986d97d24256b6438de00be7ae676c893a67d975037c8bbfc5bfbdb886cb70d28bed3dfbec5c6529906b66071cc990fc617c1b579f8d2f9f9afe20ca8
-DIST renpy-6.15.5-source.tar.bz2 10433241 SHA256 e174a61d9861144895a8a4334b6c0058c4c18c2405cd8cc7f9418380895c833b SHA512 8d1a1993fd90288a72e64d55d6e0da3f0fcfc513d2cdf63c6f4c3d84404ab7babdfb97db565c6063b057e6331f367c4662a4fc2151e8dc78c126cb19ecdfe893 WHIRLPOOL 71a0c8574f8a3b3c5008c16d20585da5a8e7f8532f66a6839ab1e2309441e70364ae45ac9e5e3088be21ad53c46e21728b1c25e893c392d1c26a200c3ae1406c
+DIST renpy-6.15.7-source.tar.bz2 10421736 SHA256 b4280b62f7c8f730a37c7e567b16216b4578fc3640fbcdf5df7c65a73ae52e52 SHA512 d79b1d6b931f281ff208b8ece3889c116ceb05c58fe115e9f7f470788e74e63cfeb3df4f804b4a37a4f1da6ba194c883023808fafc8e8beddf864424958204e6 WHIRLPOOL 202ddb045f440f9abd06f5ac02ebd92a7b0300b14f4755271f1fc4e91bdea21cda19a432f45516f68ba3ad7ead98d7491382ad5c633da277a674f799458795f3
EBUILD renpy-6.14.1-r1.ebuild 2702 SHA256 ea3e3edac5b444881e6fe63b4f5e3e71be56667e07d19c1d106196b37d3813d0 SHA512 49564c125654a59f981765a6b9d9e10095f78f2607282a156e56427cf562cd749c5c19d0f8b4f47e48fb89bf9fe5cb6abbaacbbca5aad546bc6c1a6e90b3b372 WHIRLPOOL bee53a5c0fb10a809118a2a099cd5369306f21b7ecfcebec0eb41ac4d66b41ab84139c51bb1b1515df121bee843ce9a5c4f8fb4715d21d45ee92713ac3780c68
EBUILD renpy-6.15.4.ebuild 2638 SHA256 3fb9091e652c39b177da06b140027a0b0cde4b47bc55507edcf1874f837ab823 SHA512 ad4c272d534ca9679516f4deb67b3b0f36ecf489d267309cab7fe40830a387025082e15afe368fada52fe26ce2cd31d4b08dacdecccc53094656891cd94c2bf8 WHIRLPOOL 4f8820cd653909ee7bbc19ecb764746d2d84b1f09898405d75fe48bef487da46b5b0f849da2ce6896fa0aaee5b5375d887ff88c71c6c24a4f173373af84d5860
-EBUILD renpy-6.15.5.ebuild 2645 SHA256 4270e6ec561b7131b640efe6349a06a53632cbf6c6af4c1dfd5786ee26b52209 SHA512 7f04037332f814a0d1301337f910e0259f7b83d9d2305ce76650f553040e360418433104222284ec9566d2c45d42823091786517a7afdf8e2584a8a0bf385c8f WHIRLPOOL be9fc725da93154334d0ab8818cac71af9e831ee62ce50ca8f8867696e75f9c3da842e24ba7a8c73647f382bc26e64dd4215b59d9881d275a7fb4428d14b2dcd
-MISC ChangeLog 2533 SHA256 b281182d214925cadfd8f301af752a2304fa0ea15cb1f02058fdbcca297035db SHA512 8239626cc60d78f081f2fb2c45522a5baf5a675aabcd0971edd272cc8f9ab63ee3abcacc7bd78bbe9298d83a31d753f31ce52e8df0a2138ce2aecf8a2989fd83 WHIRLPOOL 0d9b60f568861f37fdff2c4e800c8e7525422c3e1d726956717ca9990d2a7930371174fe70603ab7d5c4ce3aa8649fbb51a11a198bd164dfd3a53ee07be936d8
+EBUILD renpy-6.15.7.ebuild 2645 SHA256 97e94955d41a87baebc9259dec95146e0a92ccd17ef60c35f93e145ae7ae734b SHA512 1cb41da605b0d076fd63c916d4b55530c43adac10ff759965e47280653fa6660c0541a37fa47ee9c66fcd7dd7ed19f284727b1993a9716ceb08a9202aa8b2a8d WHIRLPOOL 8a50031158448cfb7a5f5f9b67cde89e48f138855108c51e20808529947681d1a616bc5810a567d6c970a092faf7e661b1302875ac667379eb4ec66bc95895ac
+MISC ChangeLog 2769 SHA256 6cdd977485b9599205bce0f3dcb626325e582206968da22e5f70aeb6dd0854ad SHA512 2bbdc721914054a136753fbdbbe4d25567f3c2c4a3ea6216afee50c69f2d78ee8b5c557a7230fb87cd3745b9bec9df8ba143f2ef18c713e499004bec495e8f51 WHIRLPOOL a8b1dad5c7e0b5a3307f2b67caf4cd4cfe34f54c1463c1f9ce974ac6ffa59f78f88c94202debcc561e8c650054c4ecad996c92254a717b288a5c9eb1e84dca6e
MISC metadata.xml 1256 SHA256 99cc618450c31ddfaa318c2b6d9b7999883910410c9443b9c198baa0672c6175 SHA512 e195f039ad2d2ab4dd268c69ef425e4493947f165b5accf9816a430618b92314f0adda7e0f000a79763b09ad817aa0d26ae35ce6a11c293eac17d781ccca15b1 WHIRLPOOL 312851bde9d65be4e3d5d35ea28b9f732d7d68c48e4ca0ac4b38d8bb154a1faca93f1524b4fa2bbd0ea3f4b62fa24db4710b50a80dcf61a8a096a5f32684fe85
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
-iQEcBAEBCAAGBQJRry61AAoJEFpvPKfnPDWzbQsH/38u1tvpkabB8+8eMpVW/jP0
-kkQtMft0gR5lG1snoLwE1vS1ZJvcBsIch81xu70zw+XR6lm9ZDHLJuO+MSeAPvj7
-0bXziQDvpNA3UTNl41Y8fNu6Dl+/YqJJKwlEfIHtvbdUDD+8D+md1CTQNSH6dfj7
-LATylzXY9E/ISzVKZb+1ePAShBPPJLRfl9msSDiDiZB046gyE+zLAIORo8K1fD/k
-Eh+pzLV9K0Kkt9MAudO75g77MWNMsKkiO8/8vmp2ZPZQpMJxjSXGcDPp8Kn7omrz
-vqQqMzkdrle/Ff0gknT1ID3FZws/CbOXff8kk4Vi1d1GjA5zbT/c4rSfEXX4d0o=
-=8Dto
+iQEcBAEBCAAGBQJRy4I9AAoJEFpvPKfnPDWz/Z4H/1TcV3ZlLXI5bzL76Jsc+uuF
+GD4KYAqRYajhykqhe0zoGCKVao1Wh4l252KlvRpmSTOY8wyp9EhQDZuB7wMvYQ0s
+Gxi6HRb6n2BYkuY/fkLi5LzgMfiqixrpJHHuBmLqPYkLudOko5WMSZ+b9AFhOyyb
+9jtra0paTCgsDTTjVnPdYumY4coPsrptFYAleejbe+APRGPrhROzsA6J3YclCWiT
+EgToYIIZ8jRmYW71EYeHLS2XUTTDomYRyZwopNdYJUzxW+AYU/8s3Wrt6+xsD1P+
+nKBPh/gPCOiR27J8umfLupwf1gsWw7QInHlWRrZFgQOsY8QdDo7Wvk6KtlIrxuI=
+=p8K1
-----END PGP SIGNATURE-----
diff --git a/games-engines/renpy/files/renpy-6.15.5-multiple-abi.patch b/games-engines/renpy/files/renpy-6.15.7-multiple-abi.patch
index acd44aa3054a..c6b87ac868d7 100644
--- a/games-engines/renpy/files/renpy-6.15.5-multiple-abi.patch
+++ b/games-engines/renpy/files/renpy-6.15.7-multiple-abi.patch
@@ -1,95 +1,18 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Mon Feb 25 21:35:31 UTC 2013
-Subject: fix multiple abi support
+commit ea0351d8bf6404f5e8db2ff872885a19bf8a3f92
+Author: hasufell <hasufell@gentoo.org>
+Date: Thu Jun 27 02:01:17 2013 +0200
---- /dev/null
-+++ renpy-6.15.2-source/renpy/common.py
-@@ -0,0 +1,79 @@
-+# (the "Software"), to deal in the Software without restriction,
-+# including without limitation the rights to use, copy, modify, merge,
-+# publish, distribute, sublicense, and/or sell copies of the Software,
-+# and to permit persons to whom the Software is furnished to do so,
-+# subject to the following conditions:
-+#
-+# The above copyright notice and this permission notice shall be
-+# included in all copies or substantial portions of the Software.
-+#
-+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+
-+import os
-+import sys
-+import warnings
-+from distutils.sysconfig import get_python_lib
-+
-+# Functions to be customized by distributors. ################################
-+
-+# Given the Ren'Py base directory (usually the directory containing
-+# this file), this is expected to return the path to the common directory.
-+def path_to_common(renpy_base):
-+ return renpy_base + "/renpy/common"
-+
-+# Given a directory holding a Ren'Py game, this is expected to return
-+# the path to a directory that will hold save files.
-+def path_to_saves(gamedir):
-+ import renpy #@UnresolvedImport
-+
-+ if not renpy.config.save_directory:
-+ return gamedir + "/saves"
-+
-+ # Search the path above Ren'Py for a directory named "Ren'Py Data".
-+ # If it exists, then use that for our save directory.
-+ path = renpy.config.renpy_base
-+
-+ while True:
-+ if os.path.isdir(path + "/Ren'Py Data"):
-+ return path + "/Ren'Py Data/" + renpy.config.save_directory
-+
-+ newpath = os.path.dirname(path)
-+ if path == newpath:
-+ break
-+ path = newpath
-+
-+ # Otherwise, put the saves in a platform-specific location.
-+ if renpy.android:
-+ return gamedir + "/saves"
-+
-+ elif renpy.macintosh:
-+ rv = "~/Library/RenPy/" + renpy.config.save_directory
-+ return os.path.expanduser(rv)
-+
-+ elif renpy.windows:
-+ if 'APPDATA' in os.environ:
-+ return os.environ['APPDATA'] + "/RenPy/" + renpy.config.save_directory
-+ else:
-+ rv = "~/RenPy/" + renpy.config.save_directory
-+ return os.path.expanduser(rv)
-+
-+ else:
-+ rv = "~/.renpy/" + renpy.config.save_directory
-+ return os.path.expanduser(rv)
-+
-+
-+# Returns the path to the Ren'Py base directory (containing common and
-+# the launcher, usually.)
-+def path_to_renpy_base():
-+ renpy_base = os.path.dirname(os.path.realpath(sys.argv[0]))
-+ renpy_base = get_python_lib() + "/renpy@SLOT@"
-+ renpy_base = os.environ.get('RENPY_BASE', renpy_base)
-+ renpy_base = os.path.abspath(renpy_base)
-+
-+ return renpy_base
---- renpy-6.15.2-source/renpy.py
-+++ renpy-6.15.2-source/renpy.py
-@@ -25,64 +25,9 @@
+ fix multiple abi support
+
+diff --git a/renpy.py b/renpy.py
+index 4ec5324..d873750 100644
+--- a/renpy.py
++++ b/renpy.py
+@@ -28,82 +28,9 @@
+ import os
import sys
import warnings
-
+-
-# Functions to be customized by distributors. ################################
-
-# Given the Ren'Py base directory (usually the directory containing
@@ -102,6 +25,26 @@ Subject: fix multiple abi support
-def path_to_saves(gamedir):
- import renpy #@UnresolvedImport
-
+- # Android.
+- if renpy.android:
+- paths = [
+- os.path.join(os.environ["ANDROID_OLD_PUBLIC"], "game/saves"),
+- os.path.join(os.environ["ANDROID_PRIVATE"], "saves"),
+- os.path.join(os.environ["ANDROID_PUBLIC"], "saves"),
+- ]
+-
+- for rv in paths:
+- if os.path.isdir(rv):
+- break
+-
+- print "Using savedir", rv
+-
+- # We return the last path as the default.
+-
+- return rv
+-
+-
+- # No save directory given.
- if not renpy.config.save_directory:
- return gamedir + "/saves"
-
@@ -119,10 +62,7 @@ Subject: fix multiple abi support
- path = newpath
-
- # Otherwise, put the saves in a platform-specific location.
-- if renpy.android:
-- return gamedir + "/saves"
--
-- elif renpy.macintosh:
+- if renpy.macintosh:
- rv = "~/Library/RenPy/" + renpy.config.save_directory
- return os.path.expanduser(rv)
-
@@ -154,12 +94,12 @@ Subject: fix multiple abi support
# The version of the Mac Launcher and py4renpy that we require.
macos_version = (6, 14, 0)
-@@ -97,21 +42,10 @@
+@@ -118,20 +45,9 @@ except:
print "Ren'Py requires at least python 2.6."
sys.exit(0)
-android = ("ANDROID_PRIVATE" in os.environ)
-
+-
-# Android requires us to add code to the main module, and to command some
-# renderers.
-if android:
@@ -168,7 +108,6 @@ Subject: fix multiple abi support
- __main__.path_to_common = path_to_common
- __main__.path_to_saves = path_to_saves
- os.environ["RENPY_RENDERER"] = "gl"
-- os.environ["RENPY_GL_ENVIRON"] = "limited"
-
def main():
@@ -177,7 +116,7 @@ Subject: fix multiple abi support
# Add paths.
if os.path.exists(renpy_base + "/module"):
-@@ -134,10 +68,6 @@
+@@ -154,10 +70,6 @@ def main():
print >>sys.stderr, "correctly, preserving the directory structure."
raise
@@ -188,9 +127,101 @@ Subject: fix multiple abi support
renpy.bootstrap.bootstrap(renpy_base)
if __name__ == "__main__":
---- renpy-6.15.2-source/renpy/main.py
-+++ renpy-6.15.2-source/renpy/main.py
-@@ -27,7 +27,7 @@
+diff --git a/renpy/common.py b/renpy/common.py
+new file mode 100644
+index 0000000..475b7e8
+--- /dev/null
++++ b/renpy/common.py
+@@ -0,0 +1,84 @@
++# This file is part of Ren'Py. The license below applies to Ren'Py only.
++# Games and other projects that use Ren'Py may use a different license.
++
++# Copyright 2004-2012 Tom Rothamel <pytom@bishoujo.us>
++#
++# Permission is hereby granted, free of charge, to any person
++# obtaining a copy of this software and associated documentation files
++# (the "Software"), to deal in the Software without restriction,
++# including without limitation the rights to use, copy, modify, merge,
++# publish, distribute, sublicense, and/or sell copies of the Software,
++# and to permit persons to whom the Software is furnished to do so,
++# subject to the following conditions:
++#
++# The above copyright notice and this permission notice shall be
++# included in all copies or substantial portions of the Software.
++#
++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
++# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
++# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
++# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++
++import os
++import sys
++import warnings
++from distutils.sysconfig import get_python_lib
++
++# Functions to be customized by distributors. ################################
++
++# Given the Ren'Py base directory (usually the directory containing
++# this file), this is expected to return the path to the common directory.
++def path_to_common(renpy_base):
++ return renpy_base + "/renpy/common"
++
++# Given a directory holding a Ren'Py game, this is expected to return
++# the path to a directory that will hold save files.
++def path_to_saves(gamedir):
++ import renpy #@UnresolvedImport
++
++ # No save directory given.
++ if not renpy.config.save_directory:
++ return gamedir + "/saves"
++
++ # Search the path above Ren'Py for a directory named "Ren'Py Data".
++ # If it exists, then use that for our save directory.
++ path = renpy.config.renpy_base
++
++ while True:
++ if os.path.isdir(path + "/Ren'Py Data"):
++ return path + "/Ren'Py Data/" + renpy.config.save_directory
++
++ newpath = os.path.dirname(path)
++ if path == newpath:
++ break
++ path = newpath
++
++ # Otherwise, put the saves in a platform-specific location.
++ if renpy.macintosh:
++ rv = "~/Library/RenPy/" + renpy.config.save_directory
++ return os.path.expanduser(rv)
++
++ elif renpy.windows:
++ if 'APPDATA' in os.environ:
++ return os.environ['APPDATA'] + "/RenPy/" + renpy.config.save_directory
++ else:
++ rv = "~/RenPy/" + renpy.config.save_directory
++ return os.path.expanduser(rv)
++
++ else:
++ rv = "~/.renpy/" + renpy.config.save_directory
++ return os.path.expanduser(rv)
++
++
++# Returns the path to the Ren'Py base directory (containing common and
++# the launcher, usually.)
++def path_to_renpy_base():
++ renpy_base = os.path.dirname(os.path.realpath(sys.argv[0]))
++ renpy_base = get_python_lib() + "/renpy@SLOT@"
++ renpy_base = os.environ.get('RENPY_BASE', renpy_base)
++ renpy_base = os.path.abspath(renpy_base)
++
++ return renpy_base
+diff --git a/renpy/main.py b/renpy/main.py
+index 908e246..61027ec 100644
+--- a/renpy/main.py
++++ b/renpy/main.py
+@@ -27,7 +27,7 @@ import time
import zipfile
import subprocess
from cPickle import loads, dumps
@@ -199,7 +230,7 @@ Subject: fix multiple abi support
def save_persistent():
-@@ -147,7 +147,7 @@
+@@ -147,7 +147,7 @@ def main():
renpy.config.searchpath = [ renpy.config.gamedir ]
# Find the common directory.
@@ -208,7 +239,7 @@ Subject: fix multiple abi support
if os.path.isdir(commondir):
renpy.config.searchpath.append(commondir)
-@@ -206,7 +206,7 @@
+@@ -210,7 +210,7 @@ def main():
# Find the save directory.
if renpy.config.savedir is None:
diff --git a/games-engines/renpy/renpy-6.15.5.ebuild b/games-engines/renpy/renpy-6.15.7.ebuild
index 24c4d8fc733f..add17bab9c98 100644
--- a/games-engines/renpy/renpy-6.15.5.ebuild
+++ b/games-engines/renpy/renpy-6.15.7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/renpy/renpy-6.15.5.ebuild,v 1.1 2013/06/05 12:27:29 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/renpy/renpy-6.15.7.ebuild,v 1.1 2013/06/27 00:07:22 hasufell Exp $
EAPI=5
PYTHON_COMPAT=( python2_6 python2_7 )