add missing patch

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xBDEED020

3 files changed, 266 insertions, 16 deletions

diff --git a/games-engines/renpy/ChangeLog b/games-engines/renpy/ChangeLog
index 86e0e44563bb..142f42fc7e12 100644
--- a/games-engines/renpy/ChangeLog
+++ b/games-engines/renpy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-engines/renpy
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/renpy/ChangeLog,v 1.40 2014/05/10 22:45:59 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/renpy/ChangeLog,v 1.41 2014/05/10 22:46:28 hasufell Exp $
+
+  10 May 2014; Julian Ospald <hasufell@gentoo.org>
+  +files/renpy-6.17.6-multiple-abi.patch:
+  add missing patch
 
 *renpy-6.17.6 (10 May 2014)
 
diff --git a/games-engines/renpy/Manifest b/games-engines/renpy/Manifest
index e3036ca447fa..9daa94dde98d 100644
--- a/games-engines/renpy/Manifest
+++ b/games-engines/renpy/Manifest
@@ -9,6 +9,7 @@ AUX renpy-6.15.7-freetype.patch 958 SHA256 94954935820cc1ecdd89a8f48eb4f3b3bd51d
 AUX renpy-6.15.7-multiple-abi.patch 8641 SHA256 a93776659e1292bdd41a8d4ff38d0720c3d85103326abbab6322e9175f599305 SHA512 626fe08565e226473180e51e54b650f336f71e57c71a99bda3d0e55e2115863169bd39d8d8e706f787275b81345b553c104f21a6d71ebadee017bda13826bda3 WHIRLPOOL 640bae68cc1e5c7ad2781a93e050d4b4fc3e7ec564224a1014787f5f8b0d19ab5202d7924b7e308c0e6e09a3487c707aa372794c0f5b42cd9d45954d93f3beef
 AUX renpy-6.16.5-multiple-abi.patch 8299 SHA256 8bbb5f2dc11be467d1531d7022a02540fe4155e7150ab6a731de65f11a2c0815 SHA512 a20e1623813590de466f2ababb5d49f0eece8b747745e863d3ec13a1ffac1d102181dfeccfadf9662c9932283a4ccef58824e45542083c7b3ea90bbd91f7c56c WHIRLPOOL 3f376f7e51c3b3e5cf1bd79a4810d728577b877862d86c42a9658bbeb3109ace0a97199da6b30e32c582715e6bccaee1e1831218e48e75af752e3283315dd945
 AUX renpy-6.17.4-multiple-abi.patch 8291 SHA256 ec919186d61a78aece7b01d15984edd502a9886fdfd7a163f9fa0e26f28f06bf SHA512 fd39773b85a54ca709f412430654cacdc91caaa561ad2e15bb02b08b971997062fa3c1adad5e2b582a2dc7acc9886b717517e0c10c0bab6a36fd05e52e98edf9 WHIRLPOOL ca460eb3129c0c4f429af4f88cdcf0d6e164f89f2019fba2f9e97a690d5b132565cbbbc03f6365a74e901842715b012cbff03e67c1c17ca01ccfecae9be501e3
+AUX renpy-6.17.6-multiple-abi.patch 8291 SHA256 ec919186d61a78aece7b01d15984edd502a9886fdfd7a163f9fa0e26f28f06bf SHA512 fd39773b85a54ca709f412430654cacdc91caaa561ad2e15bb02b08b971997062fa3c1adad5e2b582a2dc7acc9886b717517e0c10c0bab6a36fd05e52e98edf9 WHIRLPOOL ca460eb3129c0c4f429af4f88cdcf0d6e164f89f2019fba2f9e97a690d5b132565cbbbc03f6365a74e901842715b012cbff03e67c1c17ca01ccfecae9be501e3
 DIST renpy-6.14.1-source.tar.bz2 9806538 SHA256 18be3630d1956131a1f010732d15292cdcec14a2391210af27dc342fafd8197f SHA512 a1f13a5f860e66054012eab29bbd37715bd9721e2dc30fdd9c8d4d8c58dc672c35b3c813e962ad6878cb741502af5a181dff8a05f359892b6b60d2e15bc5a7bc WHIRLPOOL 54018731e136106f328bf2d028841f09424d8ffd8303821eec995c55918b2c8ac7eb97d9ed24785e95ad3d878b794f5bcf96cc9f783955f8d1ace086a3ca9b61
 DIST renpy-6.15.7-source.tar.bz2 10421736 SHA256 b4280b62f7c8f730a37c7e567b16216b4578fc3640fbcdf5df7c65a73ae52e52 SHA512 d79b1d6b931f281ff208b8ece3889c116ceb05c58fe115e9f7f470788e74e63cfeb3df4f804b4a37a4f1da6ba194c883023808fafc8e8beddf864424958204e6 WHIRLPOOL 202ddb045f440f9abd06f5ac02ebd92a7b0300b14f4755271f1fc4e91bdea21cda19a432f45516f68ba3ad7ead98d7491382ad5c633da277a674f799458795f3
 DIST renpy-6.16.5-source.tar.bz2 14455622 SHA256 5ecb00fa84a048ff6e1f1d8a0114373425375e9c0b2a0596bf2d47e996b9d056 SHA512 1a718d86a689135e5a280f64cdc3c0340d712b7804af2169ed4cb4a12528e01088c919b87d36176b3fb8a05e8201f226146c46c4f4d5ebf1d89c3cebd1263c4d WHIRLPOOL b06638c284089ba79d12d95ba604c40fffe595d67e75551bbe8a08ddc57403f1644dd713c5eb15a39fcc34b92722589437935666d172379bb1164d2a02ef9433
@@ -19,24 +20,24 @@ EBUILD renpy-6.15.7.ebuild 2679 SHA256 029971c958c52cb48d79623c23ce1de2e22c6c88e
 EBUILD renpy-6.16.5.ebuild 2642 SHA256 0720b9ff62e083a6da7b5d806fdba86fcea5f6d3fff8dde92b0a1675d9e236c6 SHA512 411a69604fce4b12d833a8555b3e0b0b5e70bde63f3d1f8dedb5fa31fe27ecff9d66ded68fbcc145094cff11043a1f41d8e8fa3dacc50616ab2315157186281e WHIRLPOOL 6238d267d35bcacdd1aba3b246d03752211ad6cb0e95a17a1b022dfad566303a742574a63baf52bc1e936c73c8fd2610abfe6dc6af2429560de0b5e983874249
 EBUILD renpy-6.17.4.ebuild 2678 SHA256 a33cbba62337d3f5ce216bb10f19d405c74c3ca840c2f641df8414ad892cc848 SHA512 dfaaed8ae0474e02c38d47da89fca97498221ac9eec1bd09dcab2267378f671b2bd5e4fac59f6401290b290c2134912494a3805cec543cbdd84b926b18271931 WHIRLPOOL 8c38bf92a6e23afe973af2a8a3e1fd963da4dc372616fbd4584cf4c194245597b6b393d0488ddf3e22ed84b2d49de2cb5933ee61aa3b5c8f971ff1635f65caef
 EBUILD renpy-6.17.6.ebuild 2678 SHA256 ca2cbf401dc2fc68e79475df30bef8ef3ba8202f6833e6a1c40a3387218235f6 SHA512 c36636da27928b010ce422dabca39a228bf052ab753945f0123befce8c22850daa8e9fa52e65c5755f24e6f1b7b5da7f0b247d87536010b43bf7434e2194af7a WHIRLPOOL e502f94ce41c9385cb3af4698ab82829fc40d74be3c8d39fa45452758719ae220e5b6a22f0134a9cf8f2e5b9aa8cfcf6c8bec62d2088bf4bc869a09ac5fed335
-MISC ChangeLog 6817 SHA256 248c5c6700131fb369c778efd58dc1d82e021107443c7de090747dc295c06fed SHA512 8bd665063950fd3212152f81be350375cfa9af954e7f61a5b25fa714cb0bfef29788437f50e2de8d704ee7a6c889d504ed8e2d3bb1889b5b8cc10faa69f0ea1f WHIRLPOOL b33460c735a5c36248ea1602fc3632a48fd2ab4c556011e12c9ba45926af81bfe57cc6184d78525b7d3cd972dedd49b69bfcd8b31504426aeffc9cba469982b7
+MISC ChangeLog 6931 SHA256 99f1da0b854850cebbe7feb08e614c4a198d3f0ff2239ffd0949866cd6b6ede2 SHA512 9661efa1ce664ce6c3b07790d9454cffe50bc097a8836d41a3350f62fbcf0183b3635f61cfdcc33eeffdf6f9ab31af84ff32e5dc6f85a65456704b86212a3b7e WHIRLPOOL f102a9ea8e58eacefa358bf67b2f268a922e8a22e3f77606a7c42d13747017675b74de145ccecb78348b4861ac3028dbcee29cd7634236db7ec9f9caf6c8ca3e
 MISC metadata.xml 1320 SHA256 87e82c53eca026840f61ba025e6bc8fce59f30c42c12e0560acccf25b00229c8 SHA512 13c3728b2c8f65d8795163aa95bcfc3e7a7875e1a360c283f7ceeb29bda2ef7060323f31b34dd885820294e836fa255c1433d250b7828081b1b14074e2e1e786 WHIRLPOOL 0697e087d393802545ac1163aa96a387f90adf99975f57013f5f73553a61906f3ec87460584d4e66ea3c7864b0195222e190997618cd4babe20f0fd81327bfcb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTbqwrXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTbqxEXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
-MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgRgIP/0DQGuKlAQouAzoQ4VIvzTkh
-VXOoZ6t3m/vEQ0FcalurZvuxRIAo+kFKGKF7se27keqg8y+SKBTAwB0UOoL68Zwy
-bbvvYoC26Wp3lLneWI27A6YdffrVYUS3kMWNfG/uT/T53dFGRjZ7w3p33tvqOBYK
-0ZOdbRq+eEQeCYOR9jfgmI5TwJl/l7dk1NrDpKkC7h41OFbrmhITNl0D/MHLel9E
-zYrp5t4E4VvRroyLbnvoit/6NGWmMrAh9/hkhjOumuL2KNcKRke1cnBvN7zxDALs
-5wIohvqevyYxJaxwOhk00E3QZcuyWyhuHU/vyltp8OhOnjg3UcEcss8LmuiWQXpI
-myLjkxk2QkTSzr3Xn65zy9yKlwfiGSyt1wIqPYUHPTwoupdT9+PkTCvFb7Uy19I/
-eFfifo9se1CDZn6m8awujeNnohLCsfpr4meclTXezizTuZFur4dUWtB9Zk0nAibj
-ZgcU241A95LZxlikPQVSWiUcmSLmPDTRRjQqjeqZtPzKJSn4j2csfwXzW4BpZUKI
-gV0xz31iNBnPUfG5QmWeYrdEH8PbMyBhGLzLY2x4F5VyqKYMTS9nFQrYMyhnGNcC
-yMSJis2J4d+puXNf1sxeovDgKQJ5DFpX9HNXGzDMG87JFJFWjti4izYsYQU8C5Dc
-ov3IiN1sZ+BHX2UzJ8Rg
-=PE8Z
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgRX4QAINkxkzyA3DFYSNC9t36/cX5
+Okr62kvh6cHEgNyI+YoOK0f0KFFGT/bSnWcFzs1Agg77yN/CYNEJyLcxzkhJ5GAe
+5fSsjXc5dudZc70ZieSiqI2cURZUDoN7SOlIjnXp5TOfQHHKmsVjck3+6iForH13
+CdFoJOfVtuZDjIK3T7L6VLSOc6YVtxnF5i38DFoUXBt6/BvuGuDPPudgGETjOARZ
+9kqswhkIMrj+d/jRzbu2B9CwvEljrb4OU5OAeHMlkB+8Qf+I0llkz8YIY4XxaSAO
+2OffF48O77apiJ8S8BqRiClVwP0a40TxyIzR2Fq6Tjk336sGd10sDqzL0WdqT81M
+HvGWo1eQhJHbTSTKn6xd7RQvtNAznKDzKiAoWv4uDCdswtO8GC1VpHDyernp08rw
+DepoX/jWV3U40cJnNhk3yRWgZyYz7lAJFIOldoxlIa7LDm1wo/8WLJ2Chp3mS2dq
+EpWdpYdkj/cT05VgDc5hfkf/VmSmXVs/03d87kV2E5xaDJ0cZxQtHps2hdz27OqW
+4EzkHvgRl8YZ4g9HzDa7HShnpwEETWdI1RTm7b1WpOWLTck1qVCzSMRJew51p5Le
+GM2IEG4UCdE7UpXmzaf5gdEjLv9vdGgcVFhe1f2c4zYkIzKgAnjFb7XO+qLjsWQT
+0b9mvoF8sTxhpLUCm/Rt
+=CFES
 -----END PGP SIGNATURE-----
diff --git a/games-engines/renpy/files/renpy-6.17.6-multiple-abi.patch b/games-engines/renpy/files/renpy-6.17.6-multiple-abi.patch
new file mode 100644
index 000000000000..335af4e9b8d1
--- /dev/null
+++ b/games-engines/renpy/files/renpy-6.17.6-multiple-abi.patch
@@ -0,0 +1,245 @@
+commit 7451ba936ca2f3358ca51ab562371774199c7052
+Author: hasufell <hasufell@gentoo.org>
+Date:   Tue Jan 21 01:02:00 2014 +0100
+
+    fix multiple abi support
+
+diff --git a/renpy.py b/renpy.py
+index 9f2977f..394e4e1 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
+-# 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
+-
+-    # 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"
+-
+-    # 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 = os.environ.get('RENPY_BASE', renpy_base)
+-    renpy_base = os.path.abspath(renpy_base)
+-
+-    return renpy_base
+-
+-##############################################################################
++from distutils.sysconfig import get_python_lib
++sys.path.append(get_python_lib() + "/renpy@SLOT@")
++import renpy.common as common
+ 
+ # The version of the Mac Launcher and py4renpy that we require.
+ macos_version = (6, 14, 0)
+@@ -131,7 +58,7 @@ if android:
+ 
+ def main():
+ 
+-    renpy_base = path_to_renpy_base()
++    renpy_base = common.path_to_renpy_base()
+ 
+     # Add paths.
+     if os.path.exists(renpy_base + "/module"):
+diff --git a/renpy/common.py b/renpy/common.py
+new file mode 100644
+index 0000000..1f15b3c
+--- /dev/null
++++ b/renpy/common.py
+@@ -0,0 +1,103 @@
++# 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-2014 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
++
++    # 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"
++
++    # 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 143007d..6c55bbc 100644
+--- a/renpy/main.py
++++ b/renpy/main.py
+@@ -25,7 +25,7 @@ import os
+ import sys
+ import time
+ import zipfile
+-import __main__
++import renpy.common as common
+ 
+ 
+ def run(restart):
+@@ -167,7 +167,7 @@ def main():
+     renpy.config.searchpath = [ renpy.config.gamedir ]
+ 
+     # Find the common directory.
+-    commondir = __main__.path_to_common(renpy.config.renpy_base) # E1101 @UndefinedVariable
++    commondir = common.path_to_common(renpy.config.renpy_base) # E1101 @UndefinedVariable
+ 
+     if os.path.isdir(commondir):
+         renpy.config.searchpath.append(commondir)
+@@ -230,7 +230,7 @@ def main():
+ 
+     # Find the save directory.
+     if renpy.config.savedir is None:
+-        renpy.config.savedir = __main__.path_to_saves(renpy.config.gamedir) # E1101 @UndefinedVariable
++        renpy.config.savedir = common.path_to_saves(renpy.config.gamedir) # E1101 @UndefinedVariable
+ 
+     if renpy.game.args.savedir: #@UndefinedVariable
+         renpy.config.savedir = renpy.game.args.savedir #@UndefinedVariable