version bump, remove old

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

6 files changed, 21 insertions, 372 deletions

diff --git a/games-engines/renpy/ChangeLog b/games-engines/renpy/ChangeLog
index 72f3fa997a3f..8ff4f997a8c0 100644
--- a/games-engines/renpy/ChangeLog
+++ b/games-engines/renpy/ChangeLog
@@ -1,6 +1,14 @@
 # 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.22 2013/11/22 12:30:21 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/renpy/ChangeLog,v 1.23 2013/12/02 19:12:53 hasufell Exp $
+
+*renpy-6.16.3 (02 Dec 2013)
+
+  02 Dec 2013; Julian Ospald <hasufell@gentoo.org> -renpy-6.16.0.ebuild,
+  -files/renpy-6.16.0-multiple-abi.patch, -renpy-6.16.1.ebuild,
+  -files/renpy-6.16.1-multiple-abi.patch, +renpy-6.16.3.ebuild,
+  +files/renpy-6.16.3-multiple-abi.patch:
+  version bump, remove old
 
 *renpy-6.16.2 (22 Nov 2013)
 
diff --git a/games-engines/renpy/Manifest b/games-engines/renpy/Manifest
index 17002c6b33a9..74561c3b5a83 100644
--- a/games-engines/renpy/Manifest
+++ b/games-engines/renpy/Manifest
@@ -6,31 +6,28 @@ 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.4-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
-AUX renpy-6.16.0-multiple-abi.patch 8299 SHA256 8bbb5f2dc11be467d1531d7022a02540fe4155e7150ab6a731de65f11a2c0815 SHA512 a20e1623813590de466f2ababb5d49f0eece8b747745e863d3ec13a1ffac1d102181dfeccfadf9662c9932283a4ccef58824e45542083c7b3ea90bbd91f7c56c WHIRLPOOL 3f376f7e51c3b3e5cf1bd79a4810d728577b877862d86c42a9658bbeb3109ace0a97199da6b30e32c582715e6bccaee1e1831218e48e75af752e3283315dd945
-AUX renpy-6.16.1-multiple-abi.patch 8299 SHA256 8bbb5f2dc11be467d1531d7022a02540fe4155e7150ab6a731de65f11a2c0815 SHA512 a20e1623813590de466f2ababb5d49f0eece8b747745e863d3ec13a1ffac1d102181dfeccfadf9662c9932283a4ccef58824e45542083c7b3ea90bbd91f7c56c WHIRLPOOL 3f376f7e51c3b3e5cf1bd79a4810d728577b877862d86c42a9658bbeb3109ace0a97199da6b30e32c582715e6bccaee1e1831218e48e75af752e3283315dd945
 AUX renpy-6.16.2-multiple-abi.patch 8299 SHA256 8bbb5f2dc11be467d1531d7022a02540fe4155e7150ab6a731de65f11a2c0815 SHA512 a20e1623813590de466f2ababb5d49f0eece8b747745e863d3ec13a1ffac1d102181dfeccfadf9662c9932283a4ccef58824e45542083c7b3ea90bbd91f7c56c WHIRLPOOL 3f376f7e51c3b3e5cf1bd79a4810d728577b877862d86c42a9658bbeb3109ace0a97199da6b30e32c582715e6bccaee1e1831218e48e75af752e3283315dd945
+AUX renpy-6.16.3-multiple-abi.patch 8299 SHA256 8bbb5f2dc11be467d1531d7022a02540fe4155e7150ab6a731de65f11a2c0815 SHA512 a20e1623813590de466f2ababb5d49f0eece8b747745e863d3ec13a1ffac1d102181dfeccfadf9662c9932283a4ccef58824e45542083c7b3ea90bbd91f7c56c WHIRLPOOL 3f376f7e51c3b3e5cf1bd79a4810d728577b877862d86c42a9658bbeb3109ace0a97199da6b30e32c582715e6bccaee1e1831218e48e75af752e3283315dd945
 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.7-source.tar.bz2 10421736 SHA256 b4280b62f7c8f730a37c7e567b16216b4578fc3640fbcdf5df7c65a73ae52e52 SHA512 d79b1d6b931f281ff208b8ece3889c116ceb05c58fe115e9f7f470788e74e63cfeb3df4f804b4a37a4f1da6ba194c883023808fafc8e8beddf864424958204e6 WHIRLPOOL 202ddb045f440f9abd06f5ac02ebd92a7b0300b14f4755271f1fc4e91bdea21cda19a432f45516f68ba3ad7ead98d7491382ad5c633da277a674f799458795f3
-DIST renpy-6.16.0-source.tar.bz2 10505396 SHA256 82765970429be581a514609826d83bf1d9c6a9a3a497ed00a7b07db51ee10a2c SHA512 3391f147d2ab49024f1ebedbfac5d857ad52d8a50290c06d0679c35b39712372756e8e95ccdc9ad9a1392cf8ef03a0c8c90a1df9094d522faad457e8c9dc040e WHIRLPOOL 383ee91ade2d2dbab483d7c20f4cfef5fea85231d193d6a7edcc95323dcf5ba225f5064e613131cc9e664b410fdf9edaa385a211fa68fcf06fa8674d038a7b4f
-DIST renpy-6.16.1-source.tar.bz2 14425111 SHA256 74c062b57afc33938f196a0a9f78c5de75def93f2750dbef2585fd048b2df089 SHA512 8a25e46fe94a1517ff2ab1c105f1bd368f4f9926ccd594a6e93e1e97d72fef8a82ff67d3c07b36f596a2cb890fda9b77dbd7f46dfea5bfcca981833bbab46a06 WHIRLPOOL e15d42f741865bffd0ea3213b806dc4980fcd2b04c5180d107a7728f83e0ee131707d67bda83c8564d614ac1957fb162ebf95ef3a33b43d8d0cb383a25870ed0
 DIST renpy-6.16.2-source.tar.bz2 14472212 SHA256 6212d34f5187cae6f98924bfff1aa983c9942b2aef0041cd2702255a9fef61d8 SHA512 fc3b40f01f2d1e820a05f90a2d85e42986aaa4840e506d18ea76a78527d2f98ca6cf832ebde3e1f996b94f4ce4b175856da913f3de7f1a9db48aba0eea84b52d WHIRLPOOL 5ed14cf741729a420e63c1520a2d2c04d8b5e0976023a545377fcef284be80ed1852d8c0d0a3b005a293b620298e9432f795da55dfba438528c7fd31e6a975a3
+DIST renpy-6.16.3-source.tar.bz2 14465781 SHA256 163f25df41b3e20b48f7d777b6137a96d509730484c24cb1a210dc5990e4a779 SHA512 d22cec9232d5250f343305163b10a7edfc44ef6f0db2df9c18b4c67072d4339a6fe6ed4e04808d9d49bcbce451416c8b3fc8da5248294161213b4c985832314d WHIRLPOOL 345fbb98ece9254d670bfafcbf7cba24899058c469ca7d4bfc2da720317c70fdd3ae540609b04081afb75d875213bbd0c26ac745f325cdc67e27b33b515f6e4f
 EBUILD renpy-6.14.1-r1.ebuild 2703 SHA256 e03097c56877b18833fa7e952f4ca3d1ee3ce987a7afe244fb9f75a45a7700ed SHA512 c3a2df55da0b6f1b6973c81ca8adc2a7f47279db6e426135f4bc828506d44c3f0ddc3a7bba1c392cd2fc0af4c8b541bcb73334014708f0dd27ecea13065cfe60 WHIRLPOOL 257b09f71d948b9cc15821445690152a4b30353f594e2c0df3aa91177966045279fd7c88ce707f18e33abfd279130d18d32b3ee033f7749e8081f91099458be9
 EBUILD renpy-6.15.4.ebuild 2639 SHA256 580e8fcd2095a6564ae7d353872eba4e162c49e84b2db6ebaef1d58496296a7b SHA512 cdfadf92aedf76dc94315ba4f5efdedfb6dd2bc069a81c95e2137b6cf64ebfedcb1a5870fca3df82ffbcf8fd4a1c647e45805943bffc8fd922fd5e343deafb0b WHIRLPOOL b64074a13dd6e12bd38da26c8afae63083c4c11564bf16f45faa11256711f46eba96828ec3665bfcc76102851604ac74113c270beb8f2906bd2b5048010cd1f8
 EBUILD renpy-6.15.7.ebuild 2639 SHA256 299fcba161e19c477a636a66612aeb5605871d02a35f0d0d19e30e435c3f412a SHA512 47a901f1f04da04a58c41b722fa45a803b6eddeacb0efa665746e2d465d350c6a53417078e7ac084a78406d29e2ed4719c6fa4c559449b66351158a0fd4a36a4 WHIRLPOOL e93669ad5db18acfa35e52b4ba4bdca455e1161838424e3f33308c61cd6533a3bc926890e664cf6d3bea64c2dc2ba0bc8a8730db4a6665fdd60f53486c41e8d7
-EBUILD renpy-6.16.0.ebuild 2641 SHA256 9f4e2a8ded0e8da456a23f78563ab8a62fefeefe19b05c1af4714036c06f36d6 SHA512 6e8183d2971aef5f9179ace486969eb1efe8db7c304339d9c88dd3e2c21b74a73f17757dda1322e81dc4a05bbfccb58142cdd7dfec161217b6175057f9d2b793 WHIRLPOOL 8fdb7d3b396a7b4b0e7bfcbb78a55067dec366e879ea8f53bbb253a368f3e204aa6e24f8108768f5c3fd55d1502eb58476955a5ac624c94bd78348c0ffe965fd
-EBUILD renpy-6.16.1.ebuild 2645 SHA256 13fd0d7e479e49494924676dd18e4246419f1154664042cacc99e0f5487c7fb1 SHA512 9988986d561dcb7c78d11461ac0877fd481a450523d34f81dde5172b1f2f4675088148c08ef3344c402aaf347defd97117d0dbba7ced78f0aae5f32190b4b35e WHIRLPOOL e9a04c275253fb3180781eab56082acdaa979ad695536ddb6f50bd0ff901e5763c960bca7ea0c48c272d13b2ef45847c8f549ce7879a040777747f4ca850c97c
 EBUILD renpy-6.16.2.ebuild 2645 SHA256 34bbcee61e624901128817f3b42cb3301f68f5ddc2311b8e31b25739bd76996f SHA512 a8d140030fba3eff123096cd1c2cd55cdb482beca628dc7f7d60d64d984f529df3e9861bbbdd359a0b97edc16b9053e002eaca7b65ed53341e01b1f9fa925a62 WHIRLPOOL 3d063d60c43e88b69ad47f7f3f39070388711623f9b8a7e55bd22d343213ed91242f0c9f88ae989af34896b3c22508500bfe6b1b69d14ac013ab9a5f1bd29967
-MISC ChangeLog 3647 SHA256 46770dbacebb3ab8eb256454eec4e6b39384f6f349471efbf2d1e8dc0250ec76 SHA512 2d7f9c728665df0f2470458478d41a477919f4f9ca4e45727970cdb8eb3ba4542361c66b84d70108b62b13f8324e47b1bef4231b39aea61912c36d52035cb620 WHIRLPOOL afcc55186eadd01668fe8efeeb77fb4ba27b70472c0e3d0c46728305ec7e025beec3983ab46a7650bba526bcf26f9b0f4dcd8f7b7e18c108f66e68daedbbe667
+EBUILD renpy-6.16.3.ebuild 2645 SHA256 01eede8879fea3316cecd7754ad919bd6ba148b0e8ba49dd95db93510bf614fd SHA512 60bff4697445e4e9d3752d0d450c756db48242193eb4206d8e596de88753981cfed94310a4373965563993b68bfa7595c4b6f7d1f4c4f1c693f1d593f60efe7a WHIRLPOOL ca1079ca50f3fade0c5e48f30f5edfc70d4649b8a0945a1e665d06900201c7317f292f1ebcf5dea7a54361a3ae80e22a50136f6b4192383ddf7e0cf356524462
+MISC ChangeLog 3947 SHA256 bca181c3dc68b26b6b9236712aa7d5530dd4fb52a61ae1176a6d1be2b2f87e0b SHA512 514fec98453c7e0e97d06676ee5a974a7e3c9bdd022d66ae786bf73239626cc8aaab356f7116452a2bbb5856af09ee275176292642717cf32c224ac6d848044d WHIRLPOOL 9d01446135d62e27ea60f6282ea2e5ef2eea17ee2d59cc42fb8359621a12925c1cb8b326dac5c7548bebba77b979cb9608e46b16245f8849388ec8eff24323e6
 MISC metadata.xml 1320 SHA256 87e82c53eca026840f61ba025e6bc8fce59f30c42c12e0560acccf25b00229c8 SHA512 13c3728b2c8f65d8795163aa95bcfc3e7a7875e1a360c283f7ceeb29bda2ef7060323f31b34dd885820294e836fa255c1433d250b7828081b1b14074e2e1e786 WHIRLPOOL 0697e087d393802545ac1163aa96a387f90adf99975f57013f5f73553a61906f3ec87460584d4e66ea3c7864b0195222e190997618cd4babe20f0fd81327bfcb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSj05mAAoJEFpvPKfnPDWz6bgIALEEGK6dGftvLpYeys/GH9xx
-rCQhLnkTy5Jjem4NWx/O+ivw2Kr7oVKyZn0o14TnD+qdlCa6+IUjIS0P7U9kriYa
-k7wjRlhgv+Ll407bX2RC0nTe9Xq7+/i4cFu9a5A+fy/g0VmhcoqInumW2SpnNHbf
-2cvb+OGiA9gP0td7/qf76I+ZzlU6Id7INP/nw97fvI68jtmL05LpxlWJW7dIKdzH
-AoQaiVsmigkv353U1c6M1qTfZesjAFRjz21bSuk5Ymj+Ee6BBEwLuYV7wHvDHuYi
-Z6wsF3ZcVDnTD6dSA4IWT0aT+TaaULTDUITzVqPPMGtRwhUN1tq4beO9wE1uj6g=
-=7x7n
+iQEcBAEBCAAGBQJSnNu6AAoJEFpvPKfnPDWz4EIH/37JWQiSM7YvDV93f2wGWePL
+C+Dr1xKu9J0dxyCmrVLZDTvB6jeIrBrRw6ciclh6UhJsYz91/70WA7BkEhVepirb
+xz0PKpdQ1BZdsO7FfvZQuI73LYIJslbfSNuDlwPU7OckG1pxPGR69Uo5ch06YykT
+1IHyFhNRQT7qAwrhZI2p8VS3CEX/iyjNSRTZd3ldEqlc8Hgqf7r07aEnWMiwAs0H
+A0riDcUlqxqW91I4APtJDgdWX9FmuFkeyltpwouPHJLZmWPWg8hRRwB7o0s1UObw
+Yb/Vw7xUSd8bGs9LKNCVjb/14rmosZmuoTfXcXtSr+OQnnj11g8BSaPw+TVK66c=
+=duqE
 -----END PGP SIGNATURE-----
diff --git a/games-engines/renpy/files/renpy-6.16.1-multiple-abi.patch b/games-engines/renpy/files/renpy-6.16.1-multiple-abi.patch
deleted file mode 100644
index a1c54901ac60..000000000000
--- a/games-engines/renpy/files/renpy-6.16.1-multiple-abi.patch
+++ /dev/null
@@ -1,245 +0,0 @@
-commit 23f67fe23d7b51e352a500a0e005ae3ef4dbc097
-Author: hasufell <hasufell@gentoo.org>
-Date:   Sat Oct 26 22:17:31 2013 +0200
-
-    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-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
-+
-+    # 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 d15eefc..b11bba9 100644
---- a/renpy/main.py
-+++ b/renpy/main.py
-@@ -26,7 +26,7 @@ import sys
- import time
- import zipfile
- import subprocess
--import __main__
-+import renpy.common as common
- 
- 
- def run(restart):
-@@ -166,7 +166,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)
-@@ -229,7 +229,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.16.0-multiple-abi.patch b/games-engines/renpy/files/renpy-6.16.3-multiple-abi.patch
index a1c54901ac60..a1c54901ac60 100644
--- a/games-engines/renpy/files/renpy-6.16.0-multiple-abi.patch
+++ b/games-engines/renpy/files/renpy-6.16.3-multiple-abi.patch
diff --git a/games-engines/renpy/renpy-6.16.0.ebuild b/games-engines/renpy/renpy-6.16.0.ebuild
deleted file mode 100644
index 3c42ceaddd96..000000000000
--- a/games-engines/renpy/renpy-6.16.0.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# 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.16.0.ebuild,v 1.2 2013/10/30 19:23:30 mgorny Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_6 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.3
-	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.16.1.ebuild b/games-engines/renpy/renpy-6.16.3.ebuild
index 0a8875dc69ca..6b3216d5254f 100644
--- a/games-engines/renpy/renpy-6.16.1.ebuild
+++ b/games-engines/renpy/renpy-6.16.3.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.16.1.ebuild,v 1.1 2013/11/10 20:27:02 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/renpy/renpy-6.16.3.ebuild,v 1.1 2013/12/02 19:12:53 hasufell Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_6 python2_7 )