version bump, remove old

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

6 files changed, 29 insertions, 380 deletions

diff --git a/games-engines/renpy/ChangeLog b/games-engines/renpy/ChangeLog
index 725b32f128f3..7ad19588adce 100644
--- a/games-engines/renpy/ChangeLog
+++ b/games-engines/renpy/ChangeLog
@@ -1,6 +1,14 @@
 # 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.31 2014/03/02 08:43:01 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/renpy/ChangeLog,v 1.32 2014/03/05 23:35:54 hasufell Exp $
+
+*renpy-6.17.3 (05 Mar 2014)
+
+  05 Mar 2014; Julian Ospald <hasufell@gentoo.org> -renpy-6.17.1.ebuild,
+  -files/renpy-6.17.1-multiple-abi.patch, -renpy-6.17.2.ebuild,
+  -files/renpy-6.17.2-multiple-abi.patch, +renpy-6.17.3.ebuild,
+  +files/renpy-6.17.3-multiple-abi.patch:
+  version bump, remove old
 
   02 Mar 2014; Michał Górny <mgorny@gentoo.org> renpy-6.16.5.ebuild,
   renpy-6.17.1.ebuild, renpy-6.17.2.ebuild:
diff --git a/games-engines/renpy/Manifest b/games-engines/renpy/Manifest
index 07605997a76b..4da21c6267fd 100644
--- a/games-engines/renpy/Manifest
+++ b/games-engines/renpy/Manifest
@@ -6,36 +6,33 @@ AUX renpy-6.14.1-multiple-abi.patch 7950 SHA256 7605357e2fb692acc0032380ebaff4d1
 AUX renpy-6.14.1-remove-AVFormatParameters.patch 494 SHA256 3e67e752def86a848d6a9e4a7d20c8dd3bf4158a1288065ec1f21278a4c626e2 SHA512 6589c26dfb746aa23196ad0f5a74854ef7d7916fa48298794c9d6a146865cb124c9d1b22c922d57202de87c32487706c45d3a73c90fa9035afae6604a05de75e WHIRLPOOL 6fb36d076c891b2c2e8fa6b2af548de73a575e91037fa9b4cb4f77f74262e714f499a72a93c3d1756aabed80b336dd7bbd27a3b939eb83c76453ef52a41cbe68
 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.1-multiple-abi.patch 8291 SHA256 ec919186d61a78aece7b01d15984edd502a9886fdfd7a163f9fa0e26f28f06bf SHA512 fd39773b85a54ca709f412430654cacdc91caaa561ad2e15bb02b08b971997062fa3c1adad5e2b582a2dc7acc9886b717517e0c10c0bab6a36fd05e52e98edf9 WHIRLPOOL ca460eb3129c0c4f429af4f88cdcf0d6e164f89f2019fba2f9e97a690d5b132565cbbbc03f6365a74e901842715b012cbff03e67c1c17ca01ccfecae9be501e3
-AUX renpy-6.17.2-multiple-abi.patch 8291 SHA256 ec919186d61a78aece7b01d15984edd502a9886fdfd7a163f9fa0e26f28f06bf SHA512 fd39773b85a54ca709f412430654cacdc91caaa561ad2e15bb02b08b971997062fa3c1adad5e2b582a2dc7acc9886b717517e0c10c0bab6a36fd05e52e98edf9 WHIRLPOOL ca460eb3129c0c4f429af4f88cdcf0d6e164f89f2019fba2f9e97a690d5b132565cbbbc03f6365a74e901842715b012cbff03e67c1c17ca01ccfecae9be501e3
+AUX renpy-6.17.3-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
-DIST renpy-6.17.1-source.tar.bz2 16055371 SHA256 ec36b5d696ab1b923483a0850673d6617613affc0abc0bd908cc68177d019b08 SHA512 cb19b4f3d31adbc2dc0ee251b81c903e7c50d1479553238f9846f3187c62c67804d39c987d11a7bc61d50d69fd777fd24810653457f8bfa65ce72c89ac7228eb WHIRLPOOL ee7d59b3eba76d2736a7c27bde564786fc1e55fdaf753b364e091f44efe8bbda58b5d90456fe48b9791b8fb2eb5ebb1c0896544afef2fe605b732ca3065e2e68
-DIST renpy-6.17.2-source.tar.bz2 16053490 SHA256 1d07be7c780f8a4a5cba44b6c934438c99b217480178049e7f47898762834dc5 SHA512 79ce0bb81997028bd200c7d69b3cb76a9ddf1a0cda4aad5f9241ebcbabd87e4f291b152c465674bf4f6d60f33f07a6d20d5c373c11b5e00fb6a1aad9e9371977 WHIRLPOOL 74c6df198de36728d5aa891af75942fc1d507d01e6175bd22a1b75a5a3cd1a7e583217fed9a034ba5f3f8abc5cb8a0e2c621675f7ae1c642563831635412b753
+DIST renpy-6.17.3-source.tar.bz2 16006051 SHA256 f01a6d8866a5edf34269e7a5639c394d7a09549b9f542c13108a645b65ee079c SHA512 8cb7467e19d22758b36a86453297da4fe7b8f7ec74834121b1355e6b6e1c9b8a45da44188160bc8fd92833761663e37efb2a023a72a685b3e6c157749d9a978c WHIRLPOOL 9a9ae3fe762355535df68e69d270fcaf5c53eb3d8c00a585015422d37ee67f54811b7fa739fd6d4d7f30140c906183cca4a650f0b2dba43d1cc3bcddce2877c3
 EBUILD renpy-6.14.1-r1.ebuild 2703 SHA256 e03097c56877b18833fa7e952f4ca3d1ee3ce987a7afe244fb9f75a45a7700ed SHA512 c3a2df55da0b6f1b6973c81ca8adc2a7f47279db6e426135f4bc828506d44c3f0ddc3a7bba1c392cd2fc0af4c8b541bcb73334014708f0dd27ecea13065cfe60 WHIRLPOOL 257b09f71d948b9cc15821445690152a4b30353f594e2c0df3aa91177966045279fd7c88ce707f18e33abfd279130d18d32b3ee033f7749e8081f91099458be9
 EBUILD renpy-6.15.7.ebuild 2639 SHA256 299fcba161e19c477a636a66612aeb5605871d02a35f0d0d19e30e435c3f412a SHA512 47a901f1f04da04a58c41b722fa45a803b6eddeacb0efa665746e2d465d350c6a53417078e7ac084a78406d29e2ed4719c6fa4c559449b66351158a0fd4a36a4 WHIRLPOOL e93669ad5db18acfa35e52b4ba4bdca455e1161838424e3f33308c61cd6533a3bc926890e664cf6d3bea64c2dc2ba0bc8a8730db4a6665fdd60f53486c41e8d7
 EBUILD renpy-6.16.5.ebuild 2640 SHA256 27758933b6a4fcf925da79fe21a131f832607a46e155538ff7b7e831b68e8a87 SHA512 45e945120630a94029e290955c3e9fb71edfa1efec36bbe206fc0784b2e3a8b838d2902b2be2f85ca3c521ae440ee4a61f7b8fce93250fbad91345fc08fe9f25 WHIRLPOOL e1fe57d22fda96ab558d3bc2dd350876750ba85028360922c0e8266df4da1c01494ff7b924ce6a046ec3df73d81a9c430a575cf9a4747cbafe796370bdbfaad5
-EBUILD renpy-6.17.1.ebuild 2631 SHA256 f7472802aabd996fe4cfd61c5ff232923caa34e439cffba310436ac1c454bc75 SHA512 7112bd09f2801229e437bf27507ce28a4fe0f9cb0a8b621b28b36182643ff2825d3adcd064f2f6f7067601f9bbb1fe1a428c07748598ff71fee2397f151cac46 WHIRLPOOL 7608e03bde7d32cbcc95744b48dbeb521d1ad730c25b2657d9b60dab96b08e000d951188e146df553219dce5ac62fc9ba42d726a63d756d3b53b3e5f5a86ebca
-EBUILD renpy-6.17.2.ebuild 2631 SHA256 6a66711db9f9e2d763ec2dab07bc8e85b5a876648f73f2f1ac09ec522bde34c4 SHA512 5a1c632c24007feb42e995bb94be483217bb7a0e55843464a835aec473a1ff452d963938243062010cbc941794c3210ef88cf7e278480093c36036661d8dd4e3 WHIRLPOOL 4057d6734c72812a88dab3293200fbbd5e99f2f6afdb5c63130cc89a7822b67a25a2e90ddcb5d93c029b900e6ddd5022e4c65d749161685bd39ba58185cd7c50
-MISC ChangeLog 5410 SHA256 5be7504af8793eb343230e36cdba378ce6d33f63c34fcb9313ab99edc2c91195 SHA512 e89ccddcb75944572649465d43ff448155e2fe654632e7e730a8bde4239e586b09dfb235877968d59d11c4e2738aa34384f4d3a19a06978da5c7dfe321c7799b WHIRLPOOL 0841db38ce91de0a1a8a151192c28d8280fe73cabfcea7679334c37f1bd58bb92f2c4e4995e396439099256115e96095f55d889bd4229eaf1320d694bdf4e99e
+EBUILD renpy-6.17.3.ebuild 2633 SHA256 62833fd8bd273425777a6e164992f9dc72d02bec147bd8b1f72b591e2704bbb3 SHA512 6da3d5945d06ac936e525fcd07f32cbd7ec0c2a2fb789e8df3d914a51a61b6b3a55d7595e54a86be9f0021d56873584b23024485bec0840f1ea99e58c4d69a00 WHIRLPOOL 31e48fc38fe6fa56c04532fa857c8cea29bd9725877e65b224fd2f2bb8bf30501cd951c665f6ed07528ca681a1e3b64feca0ddc58cb699b271ece7b9b75a754e
+MISC ChangeLog 5712 SHA256 6dbc307b2084569653437226af0efa7b556a34e8e44ca24a00d63ed13c1c306e SHA512 6fb882b74cce358b23e8f6f8f764131be21fe6e9b121ff4e35b0605ab238aa5d1a7eb8851f2836895f3464121a5b8d4bf4e5ecb8be13f1483150a5d848ecefc0 WHIRLPOOL 4a7e0e2c81ab6758b751ca63297c4bc8029f6090ea9d647e94bb1b05d9d9c977e15717dfb49e9143d5a8cbc1ca228216d2f1940527126329b6f89c102600e521
 MISC metadata.xml 1320 SHA256 87e82c53eca026840f61ba025e6bc8fce59f30c42c12e0560acccf25b00229c8 SHA512 13c3728b2c8f65d8795163aa95bcfc3e7a7875e1a360c283f7ceeb29bda2ef7060323f31b34dd885820294e836fa255c1433d250b7828081b1b14074e2e1e786 WHIRLPOOL 0697e087d393802545ac1163aa96a387f90adf99975f57013f5f73553a61906f3ec87460584d4e66ea3c7864b0195222e190997618cd4babe20f0fd81327bfcb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTEu8XXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOxaEP/3H8JkkWa+yLwvgNAQrnizWj
-7bn+tGpsaRpZ6mKN6CtJjbiVmC4nFgsv4b+/AvTeiKcpN4jtEl+TXNL5/kVjQ+lN
-imzom18SngtTQBgB6dxmgTugar/L4QliAz8jFi+q2oicCM+0VvJIujZNzy+x8iOS
-tu5Uc1TfHDi2+dWMNhP/VsSrGGaIjNXVqfVVNoM3gTPbf1noww4wyut6/v5tQg8a
-854z2Y8KY+BC2Bq/rV5NXsUCPUzF5nZsnqMypUKn5UZ0VFZodp6ynB+Duca+VxLa
-g0l8EpP1HNjfLFWYiR/e7Dwx29mr47iy+pbG8JZx2siwOhfYszZ15nwxRD1nE+oV
-J29ePdN8hEz29b48gOSUvTaQC3559I9EbP5a7DMT3MnRmuK1GjncUxxQzMA66FiF
-e1rkQyA9ttQneL33CizW6e+c8hbndB71u0H/D4QO8DOlQWSsaxY609UQAKoaPVyn
-UYiOK6xF3XXmPejgQiN/THyBRjufNUwIo5ttGDUdmjETmIE+NE55uD4R3wVgoyP/
-fZBDCgEzzJfyWwRpY3nlRTj3oUQNzYTqmIeyINaz9Fb9WUxBu5HH7iw1xYh3U/0t
-0weMjdqqlt0voh9ueqJApHJhGWeeMM/0vQpSe0F6HeanvSDrS01obu2yUoHNF3VI
-2sCgvqsXCr7vHJF62EPe
-=xS5s
+iQJ8BAEBCABmBQJTF7TfXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgznsQANLf8A5ISvb+Y42sWiW6AKhr
+ytdDukDymQJL5Y+6hlimD+JHu7mjsaVV41ryYJPaWUs5PLipP86jJEqb31nBfO/J
+wRl1Ritw147szM0fB4p3UbWlR2Bukb2PoZh78neS5UUjyBuejRhPL0QQFVPiMMXk
+EXNJxPGBiJ19SBg0WMxMHozd/AQv3VhPwwt5WaJkpIF2eLjgLZArtNPBI4g2XrVs
+4PBXA0TW03DsRl9k6ltxTwwWc7nODhhFOg2LFqM3QUwrU/omDxsyBwS1osBNHYt+
+EkWBUHDhpeVGUPzpJ2vWdx0tBfe86aP2wMB1Nyh6RCc3sIOCfHP7l41oCxjnnGr+
+qiCRCJ0fU42HGYcVGtdQDmtzM5OaLXT4RK1hlLUqEG5iXG/OhoZMT2vlRlOSpjpo
+BPzyEK8WyYLNngLnKrkAAk4FSaclRhUzv7/xwGT5X81O/tjDFiIYMq9HfSE3jD3f
+ZZ+sBv7jgKioCE5FW/HQsy/vDe7MO0pzb4UTPfl9o+8lkNMf7Q/KZv3Wc431usUu
+uTnT3CKeMWgozSLMFx8QuTcgP6qMJOoTcMJtq7p+kwj70X1KB0L4q6qgOKMbvsIG
+pkmR5UWSHttEDnVToR2imd3yRScjqRkWa3N7NlDgX63m55CVbk6PFiAiX8tfQzLi
+z1VeSujCkoOzAurS8qRi
+=koVy
 -----END PGP SIGNATURE-----
diff --git a/games-engines/renpy/files/renpy-6.17.2-multiple-abi.patch b/games-engines/renpy/files/renpy-6.17.2-multiple-abi.patch
deleted file mode 100644
index 335af4e9b8d1..000000000000
--- a/games-engines/renpy/files/renpy-6.17.2-multiple-abi.patch
+++ /dev/null
@@ -1,245 +0,0 @@
-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
diff --git a/games-engines/renpy/files/renpy-6.17.1-multiple-abi.patch b/games-engines/renpy/files/renpy-6.17.3-multiple-abi.patch
index 335af4e9b8d1..335af4e9b8d1 100644
--- a/games-engines/renpy/files/renpy-6.17.1-multiple-abi.patch
+++ b/games-engines/renpy/files/renpy-6.17.3-multiple-abi.patch
diff --git a/games-engines/renpy/renpy-6.17.2.ebuild b/games-engines/renpy/renpy-6.17.2.ebuild
deleted file mode 100644
index 8209ba27608c..000000000000
--- a/games-engines/renpy/renpy-6.17.2.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/renpy/renpy-6.17.2.ebuild,v 1.2 2014/03/02 08:43:01 mgorny Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit eutils toolchain-funcs python-r1 versionator gnome2-utils games distutils-r1
-
-DESCRIPTION="Visual novel engine written in python"
-HOMEPAGE="http://www.renpy.org"
-SRC_URI="http://www.renpy.org/dl/${PV}/${P}-source.tar.bz2"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-MYSLOT=$(delete_all_version_separators ${SLOT})
-KEYWORDS="~amd64 ~x86"
-IUSE="development doc examples"
-REQUIRED_USE="examples? ( development )"
-
-RDEPEND="
-	>=app-admin/eselect-renpy-0.4
-	dev-libs/fribidi
-	dev-python/pygame[X,${PYTHON_USEDEP}]
-	>=dev-lang/python-exec-0.3[${PYTHON_USEDEP}]
-	media-libs/glew
-	media-libs/libpng:0
-	media-libs/libsdl[X,video]
-	media-libs/freetype:2
-	sys-libs/zlib
-	virtual/ffmpeg
-	virtual/python-argparse[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${P}-source
-
-pkg_setup() {
-	games_pkg_setup
-	export CFLAGS="${CFLAGS} $($(tc-getPKG_CONFIG) --cflags fribidi)"
-}
-
-python_prepare_all() {
-	# wooosh! this should fix multiple abi
-	epatch "${FILESDIR}"/${P}-multiple-abi.patch
-
-	einfo "Deleting precompiled python files"
-	find . -name '*.py[co]' -print -delete || die
-
-	sed -i \
-		-e "s/@SLOT@/${MYSLOT}/" \
-		renpy.py renpy/common.py || die "setting slot failed!"
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	cd "${S}"/module || die
-	distutils-r1_python_compile
-}
-
-python_install() {
-	cd "${S}"/module || die
-	distutils-r1_python_install --install-lib="$(python_get_sitedir)/renpy${MYSLOT}"
-
-	cd "${S}" || die
-	python_scriptinto "${GAMES_BINDIR}"
-	python_newscript renpy.py ${PN}-${SLOT}
-
-	python_moduleinto renpy${MYSLOT}
-	python_domodule renpy
-	if use development ; then
-		python_domodule launcher template
-	fi
-	if use examples ; then
-		python_domodule the_question tutorial
-	fi
-}
-
-python_install_all() {
-	if use development; then
-		newicon -s 32 launcher/game/logo32.png ${P}.png
-		make_desktop_entry ${PN}-${SLOT} "Ren'Py ${PV}" ${P}
-	fi
-
-	if use doc; then
-		dohtml -r doc
-	fi
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	use development && gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	use development && gnome2_icon_cache_update
-
-	einfo "running: eselect renpy update --if-unset"
-	eselect renpy update --if-unset
-}
-
-pkg_postrm() {
-	use development && gnome2_icon_cache_update
-
-	einfo "running: eselect renpy update --if-unset"
-	eselect renpy update --if-unset
-}
diff --git a/games-engines/renpy/renpy-6.17.1.ebuild b/games-engines/renpy/renpy-6.17.3.ebuild
index b9d5d33b0173..7d11a374d6e6 100644
--- a/games-engines/renpy/renpy-6.17.1.ebuild
+++ b/games-engines/renpy/renpy-6.17.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/renpy/renpy-6.17.1.ebuild,v 1.2 2014/03/02 08:43:01 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/renpy/renpy-6.17.3.ebuild,v 1.1 2014/03/05 23:35:54 hasufell Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )