rm old

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

6 files changed, 21 insertions, 734 deletions

diff --git a/games-engines/renpy/ChangeLog b/games-engines/renpy/ChangeLog
index c70581a71829..63e613d34247 100644
--- a/games-engines/renpy/ChangeLog
+++ b/games-engines/renpy/ChangeLog
@@ -1,6 +1,11 @@
 # 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.45 2014/08/20 17:35:12 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/renpy/ChangeLog,v 1.46 2014/08/20 17:36:28 hasufell Exp $
+
+  20 Aug 2014; Julian Ospald <hasufell@gentoo.org> -renpy-6.17.4.ebuild,
+  -renpy-6.17.6.ebuild, -files/renpy-6.17.4-multiple-abi.patch,
+  -files/renpy-6.17.6-multiple-abi.patch:
+  rm old
 
 *renpy-6.18.0 (20 Aug 2014)
 
diff --git a/games-engines/renpy/Manifest b/games-engines/renpy/Manifest
index 7ff64e26fde4..aebe402af8e3 100644
--- a/games-engines/renpy/Manifest
+++ b/games-engines/renpy/Manifest
@@ -8,42 +8,36 @@ AUX renpy-6.14.1-remove-AVFormatParameters.patch 494 SHA256 3e67e752def86a848d6a
 AUX renpy-6.15.7-freetype.patch 958 SHA256 94954935820cc1ecdd89a8f48eb4f3b3bd51d151e8345ba618e20d6c0c149c94 SHA512 890def1f2f2a54d4717e325cf15700e348f7d73e3afc86e6e5e1366c9bf01701b33f7d48ff5311855f74cf7fe5de3285635cb5aa301a213c419566c05d8a6cd9 WHIRLPOOL 2c2a019a50b94ca8dc4e70e17d07ca80f014606f34f6f0506803e524c41b6d4153ac44623fc8a42cbab1e144c99c064453f7533f9ed5132311ed079dad772faa
 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
 AUX renpy-6.17.7-multiple-abi.patch 8291 SHA256 ec919186d61a78aece7b01d15984edd502a9886fdfd7a163f9fa0e26f28f06bf SHA512 fd39773b85a54ca709f412430654cacdc91caaa561ad2e15bb02b08b971997062fa3c1adad5e2b582a2dc7acc9886b717517e0c10c0bab6a36fd05e52e98edf9 WHIRLPOOL ca460eb3129c0c4f429af4f88cdcf0d6e164f89f2019fba2f9e97a690d5b132565cbbbc03f6365a74e901842715b012cbff03e67c1c17ca01ccfecae9be501e3
 AUX renpy-6.18.0-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.4-source.tar.bz2 16006541 SHA256 97b2de94c05e2c67c69e2c1bf9c0456bcb767531b0bcf4470c94ab4d488a13d8 SHA512 cc8902444c6f51dae5924fe5595ea730e1e9bca3653cd1b150bd458aeaf64f04b4de0579c40ad69ca9a5ae1f53dd5f95ad2fe36f3b44e72f6cef495d5340209f WHIRLPOOL 370432615a163dc2e2f4dec0423b7f1ff256182b2258817bda29da1a66c516cf3a561826af4ce776d4b2dc9e8d00974906e410d82d7e2b4587f468b039b273c6
-DIST renpy-6.17.6-source.tar.bz2 18021268 SHA256 2ccedcc192b7c10dd0ecfe0ac5c485f999177f6a67806f63c33f64cb12b77e66 SHA512 60953e1c264ffe051e218df91478d25a19beda6cc5699b2b826d6ca17b4f111c41e4e4c1d165c76a6bb131cc321f06a48d6708b2f5aa1af5f66479119e8f7c16 WHIRLPOOL 6dbface7b2775d8b2b00c2665a7949cfccb2f2487b87afd5e6d2d34bc750f0d5952268d12b5c858d026a850c39f579faac38a07d5581d7c441ed2a40770d22fe
 DIST renpy-6.17.7-source.tar.bz2 17932988 SHA256 fef01de9e482b73d9d409de7a43bada6dd3e2a0549b99dd487306371190ed038 SHA512 22b0e08b18ee35317b11451205233cbd8a29617d9c3d298bbdcfc5757f67c2f0e4c8a748aa83d5c8b43786c062ffca109d07e981efa750fcee26f45f08a33ea2 WHIRLPOOL fef82eb6c958a2525797e5d8bfae3488fba606b70eeed5c94f7afcab4fa46e7a7eb43d91b4bd55f553b65a72b12236e02ecdee55e8852c1fafc055332f9d131d
 DIST renpy-6.18.0-source.tar.bz2 19639455 SHA256 5c22ac631692c1dd48f17f3a6dc0c8e79f79d128878818ad0d7c47c2fb0ac805 SHA512 c54010c95a6075aaec95f256c456e2959d2daa0ff9b9e313c2bd6647dc5d0e971a717f8a1361d9afa59badb177d8e9e8afa3cd9f3d69b603a9045ea79c35d92d WHIRLPOOL 988eba8d56b3ddc0830e1558093c295c331b48da0408ffd4e6dc524adb8fa845ea2b15b33deead32c6e54e38f8b10598cbdb7d086a817f1d3f2d508dfe219a6f
 EBUILD renpy-6.14.1-r1.ebuild 2698 SHA256 22fd3eaba2f10c1afcc9d3460156eb1ed917404d3f6c6308a31e0f9dac6df31e SHA512 8c8373c5d07604a46b2e1a47900b3eccfb8ec76c6f5c4bf81cb201863533cd7383e40d3b880b6e3d400de07d84195eb8a3e589e2bed052ff1c8264ba5fd209cb WHIRLPOOL bcdae321e79d8b3ea76904af1370fab84bb9f744fb3fe519dde46953287c575fc7f0e3f946d498ecb9788e5bb3fac0c0bee59a007cb7d9476e81f72a4274be38
 EBUILD renpy-6.15.7.ebuild 2634 SHA256 526f5b7ec189f27e65dbf479bbb4a83fdee03b4005b693bf3af51d60efddd169 SHA512 101e2904713ee9c55e94717556a0d0065923ce8144222ea736809ffa19bdd65ffac28d37c6743535bf040c365baeab8c59985587dc70c0d4cb2b8ae2af9df800 WHIRLPOOL a9e97a5979b89792a90ff6716cb5b2c4dd8ca149eb79bb92bcc858a465e472267929c9a1cabc65e93db2cc04f7fcb28fe4ecbabe28d6772e7b5c28ae75b0a568
 EBUILD renpy-6.16.5.ebuild 2597 SHA256 f84bc37fe9fff5d43fc12838894374111cee5302661bacbc1e6de7b699af33ad SHA512 f601fc17710e6da76a37c40e77a175b8bfa8714d46b51c8e1e5804892d68c094f95b7b83434e8d552db74a952c6564df8bf74c7da07af6cc876c31ce2b6b9f4a WHIRLPOOL 108f26106e6ac00007ce851132b466bea945a4322ffbaee6705ae034b1e9381a8437d4cd12c88e2da15b3685624b7db5f012d903432532b56d6fee5e3fa62a97
-EBUILD renpy-6.17.4.ebuild 2633 SHA256 081cb9a9bf783cb65d6bd4214a34c04b25b83b3ed7f51dcbbad6f910fbdea58b SHA512 e5094a6cae2f54e683b389fbef87fef794b77ae7bb58c401296e51ef6b572023c65bd778d79d973323f31c5fc46b1fcb6e8a27280106b15a7dae48658736cd58 WHIRLPOOL e690876c5a444acadeb79830c710f0d4ff639ce6bd49eb4c57e8095b08fca8f19c083f8c9175ef169d55bbe000f59c2f54a7ca1e64404ccda5d44594d7e77be4
-EBUILD renpy-6.17.6.ebuild 2633 SHA256 e2d2d837eb48a39175230c5d482c3bd8769df8fc11241c18046d2fca27b81edd SHA512 5651b5bc3c7bb911abd9fc2f302c6b90eb6f92ca2118914ae827882a0ef9c0510fced000bbcf81f1a6ac4b7347ed8408c0b753388488a92ae84950cb000c606b WHIRLPOOL 43ce676776bdb24fb2c53198559bd3c5fd93f4dc5108ff62411ef98fbef501c72d4ff1d4dbbe60edc0e83abe90029dcfee6beae183f134547f4d6a0acdcf665e
 EBUILD renpy-6.17.7.ebuild 2632 SHA256 c8575832a78cd54e80f90a2cb33eba0c57541abe77fdcab1f70302d631d95369 SHA512 259f7bbcbe6601bd86ad9282db0f95a3875d2aff9b837d3c1db53ec4508a3327ad018fb54330ec91bd29bd78dcd73efaf18d6f90ac9cc58d2a76110e94eb00d2 WHIRLPOOL 5ba0fb9816329a29919eb293e27c1210820bdb50aa4d811db08e47f8ed3851e27de8159ee131223573af63a6c49a67f5ffbe2761a34c8d26ceb80e31092403fd
 EBUILD renpy-6.18.0.ebuild 2635 SHA256 de7d49fb37c35d1cde73fd9f4c47fc2e4085a0049715ee07bc4c1c4e42ed5c11 SHA512 3503131e82fc0a73d6b047276abe6aea0eba1070127cceac39b417d4d83d5a17440be9b181e07185d4c9e7dd2fa9696c1690d67accdaf47d19cca17b44ca29cb WHIRLPOOL 86c4c8fa859c4315a98c56a021cd32f1d5f65bae816c411cac28a64475f1885315fbe7fbb855b4b1b7fcdfc9e027a6f47e3839c6eeb7cf41e1624e033411a6fb
-MISC ChangeLog 7665 SHA256 ae0ac92e516386b26885cbf070ed311e2c21438005ce2ba676d519c01ea13ea6 SHA512 2a9b62fb0854a355b2917f2713c5ac0d6918792db0a5398a04cd9d848b0af16feafec3009277bc8285fd819a22c678e14fac2904d583a81276ff0aeff82300e6 WHIRLPOOL 827ea3eb7e088776d8869923670bc82699f6fa48b6b6faa5c5d6c52f76d51a28ccb889ffe8a3b05f1a80c80dd1e8a91203632f7f13bba860e7f1f3d03b3fcfc1
+MISC ChangeLog 7854 SHA256 ed9dd443c3174c3828de3ad3c550b353413b308be5da63b3fbcd0264e6c43cbd SHA512 ef81bc1d35a67a135d00482add41140633b05522f74ed89b9f1e1a507436b9729994d8701c4b03a67efa43ad3ca20847aaf8e8792c75141469d3a01903c37450 WHIRLPOOL c67507cedc6f981814d772d0bcf173369995ad216476235a51515fd8f92c2f8981baa65c8ed5ab7e81528b997fb9c7caca6dd4620d070ab2c05a8c8b69977884
 MISC metadata.xml 1320 SHA256 87e82c53eca026840f61ba025e6bc8fce59f30c42c12e0560acccf25b00229c8 SHA512 13c3728b2c8f65d8795163aa95bcfc3e7a7875e1a360c283f7ceeb29bda2ef7060323f31b34dd885820294e836fa255c1433d250b7828081b1b14074e2e1e786 WHIRLPOOL 0697e087d393802545ac1163aa96a387f90adf99975f57013f5f73553a61906f3ec87460584d4e66ea3c7864b0195222e190997618cd4babe20f0fd81327bfcb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJT9NxSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJT9NybXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
-MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgxMYP+wWaMt0dZiErs1FHeC4NWLWz
-CrSSaRo5eAxhlPl6hwhNmwVd65ss0AhS5uFPSVkwvuoTkgSMl32Sa6df2cFjCSX0
-aAt8/z9fy0GamA37a2woJY+RDr8RUW9MMZwAvO92VcQkpQ5Ztw6PR+0ByBUBXbaG
-8quYHR/wgxSooKqF+w8OL0lUXcKMvoGAzEei4ucOMUjLRnw7anlV3VogPlIwrzVr
-d9bfwtqn4EKlM4LQAzBQ7w/tgmQ8CovT3VRFlU2UXHM+dqFCkISV7QBT2/EzGu9l
-fC9dKLBBv4Y8qdtZFaYUcCk9E3eohALJB87AcYVLg2uOUxsKkrWB96el8yVeRUbY
-H9Tvt8n1H8c3fyZuiHIAVj49I2/EfRoH30GE+yXHFSeDVUzaD5YB31X/8nPJXnS2
-mgkAiHJ9dJRWMnsld4bDWKnUdPCWjMAbJbP/hm7x3nF8FKCEhRVJ78xZR34/8/3i
-K2FcWHJitB9H+nFCdI5D8q4RmpwKvKlRqM67O8XR2O0YdMtIcxbaJbuk9QfrojlY
-pVop5mq1Rfra7IB0iIMAopZmX+zMn3e80PL5UdV9FcktM9WOh7wM9waIJ/5QTmD/
-aUCx4NfQ9qMAtdMABO2hoKo2ACTsxoEY7E3g/C7pUCL7h4Gm+65I9TRbnHNjqeI4
-irtJJCelGeFIdpfwAW9I
-=xFGH
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAg1doQANIA/3bo9yjTZUHzGsEjGJXT
+L4KKayY8teWGQ+/2l5RSKMUaIh68rU/j4T0jgIYfzNU9RoWpbIt0cNUiPh7rytOV
+YxElYzCaH34o9RtCprVmyl8mB5kB6O8/v1wDHIkl6u79p/+caeBEVcblKJ4sO9M3
+8+RVKkykgOfhqifCXEvpEZxQOtE5XtvqAtGwfd+9NdpIMwb8HAaVO6/NfcrQtBl8
+UC0/XITRf58lJJdd1QmF4LvcD8dyQtumO1pcYIviGl9eGQLh9Q5MCLwr7GW62czr
+/iIyXVVjeZoCQ/h8xsgtXxy0dtLUuWIYAjSVc6NPyEasHbkY7VtT8UZIGQMLWvj/
+eFm1PrCixUrZ9CqninCqbCjBk+vxdI/B4rruBvcBqyD5xcgPHl88nCoU1LWlpZjC
+sYFwox1x3fWL4245sT2P9+NfkQEVPPfMyNP7Ro7TRjZESZHANzNXnvb2LNuN8zsm
+d+Zj3hHxoUxkHWf8Gb5bo3C5k7I0AA0QeOke80+84RG+9f//I2SEyzEJjH5cn4Ti
+Dc3h2wlaLZSNC1k070MD95Cv9MCDXRHQP/RBGesTr/GxFQwc7Zh8BB7xrDO1gbfI
+qQRl/pd1my8t83fMGmo4o2gc3PIOk3wSEl4YaK/Su/wIJUx+N3GI3+lfnN7+Twpb
+HwzPW2QM/E4vCHg7Fx8Q
+=pAQr
 -----END PGP SIGNATURE-----
diff --git a/games-engines/renpy/files/renpy-6.17.4-multiple-abi.patch b/games-engines/renpy/files/renpy-6.17.4-multiple-abi.patch
deleted file mode 100644
index 335af4e9b8d1..000000000000
--- a/games-engines/renpy/files/renpy-6.17.4-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.6-multiple-abi.patch b/games-engines/renpy/files/renpy-6.17.6-multiple-abi.patch
deleted file mode 100644
index 335af4e9b8d1..000000000000
--- a/games-engines/renpy/files/renpy-6.17.6-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/renpy-6.17.4.ebuild b/games-engines/renpy/renpy-6.17.4.ebuild
deleted file mode 100644
index c3ddcb4614cd..000000000000
--- a/games-engines/renpy/renpy-6.17.4.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.4.ebuild,v 1.3 2014/07/06 12:53:35 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"
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	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 templates
-	fi
-	if use examples ; then
-		python_domodule the_question tutorial
-	fi
-}
-
-python_install_all() {
-	if use development; then
-		newicon -s 32 launcher/game/images/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.6.ebuild b/games-engines/renpy/renpy-6.17.6.ebuild
deleted file mode 100644
index 1e1649ea90ca..000000000000
--- a/games-engines/renpy/renpy-6.17.6.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.6.ebuild,v 1.2 2014/07/06 12:53:35 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"
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	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 templates
-	fi
-	if use examples ; then
-		python_domodule the_question tutorial
-	fi
-}
-
-python_install_all() {
-	if use development; then
-		newicon -s 32 launcher/game/images/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
-}