commit: d450d294678d15f7de8a8d3d97bf31b8b3607b98
Author: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Sat May 21 11:14:51 2016 +0000
Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Sat May 21 11:14:51 2016 +0000
URL: https://gitweb.gentoo.org/dev/bircoph.git/commit/?id=d450d294
renpy: sync with tree
games-engines/renpy/Manifest | 7 +-
...e-abi.patch => renpy-6.99.6-multiple-abi.patch} | 156 +++++++++++++++------
games-engines/renpy/metadata.xml | 21 +--
.../{renpy-6.18.3.ebuild => renpy-6.99.6.ebuild} | 10 +-
4 files changed, 130 insertions(+), 64 deletions(-)
diff --git a/games-engines/renpy/Manifest b/games-engines/renpy/Manifest
index a198b8e..a90e801 100644
--- a/games-engines/renpy/Manifest
+++ b/games-engines/renpy/Manifest
@@ -1,6 +1 @@
-AUX renpy-6.18.3-multiple-abi.patch 8880 SHA256
8b5c5131542685fca8e0df84daf651004cb50c78138f46da84715faab00b78f6 SHA512
5162aabbfd2ca6d9ddd56f2f78b7224833a729a9512785663f4782c9a4ff9993f70d56594bc416658353ce3bd02cac1105d9df540c0ac11ac1403ceb555d1b99
WHIRLPOOL
852fbb06cf8b268e9b1e0d87b8dc23ef03514830c9fb4b4f6725ae7f6405f4e1ff77eddfac3f54dc1df2c09dff1f091752d08dab34a1e512f873923bc39199c3
-AUX renpy.1 4642 SHA256
249fb33053da00de6a8156b33b8d29df2536238016e353f4e69d8eb5d8bf851b SHA512
2727a6ff9675a2b82a979faf5d75e7b3b96915f4c7382d22bba35d74674e613f45d4e8437e24edb410aac45cd8d219cc68e118387e538aafb32b0c312443b066
WHIRLPOOL
1319d4587c2cecb2563aeb198e9aa98bd31733899e275bce137e12e0e806c9bc396e9ac6f2180c993acb2174c4bfc221c79d568a4ba051f5e6558e3bfb042bb3
-DIST renpy-6.18.3-source.tar.bz2 23244450 SHA256
c0c6af79ceb529e69cebfdb0e9849e50dc27e424dc2fd2b322c13d6ec938cba6 SHA512
7ea99adaf1fbea7a499790fb5b37349fc797f383fb633956a43955c80885b259e26570469c430f4c4c103e62444f60082690489ee6400809f5e9024693261e55
WHIRLPOOL
6e4e68228bc38c709af4387f209717e4644efccae47fb04b7071783b0c01d6fbe4ca65d7c712a32e159cd59c663873457e54c3851e9e4a84d3d4e4ed05271102
-EBUILD renpy-6.18.3.ebuild 2671 SHA256
c4620715be017f2f61cab712c65819f44c9f5d775d1e86b2006ab2386084ffad SHA512
367fea0149d45b9407c63ba7aeab6f3712e53b1fd847da9b10771b29b334f4fd47397be3bf51e7b4191933be8294ab6ac7748dd0e6ce7ba2bab3141d76361f33
WHIRLPOOL
bc8c1f7d866c9330f48d6563d9667aa842ba526265dbcc84c3207a6a950fede89fade60464faa1da88de50d1e6265c5adc9dbbb8394c56b584c62ae4ff6471fa
-MISC ChangeLog 9189 SHA256
acbb24bf21ff9bb29bc0f384d15d186cd60bb5fd0978642da75ebe178dcbbb14 SHA512
3ce6a44b3e5076ac4f320fbfcbd80705bb2911894978798220c2c3e135d714b2a16e52d3fa238ff6ba85ce0a85c2e9d14ccd4e25bd738212f7d778f9cbc1db7d
WHIRLPOOL
0bc9a9b06b1b09100d02eeac293a522deb4dec1486a00d2c992b1ecbea7ffebf519d9e9743fa5f7b3a7beb5ce110e3bb01b2060645b1ad462fbf5ace08ed2877
-MISC metadata.xml 1320 SHA256
87e82c53eca026840f61ba025e6bc8fce59f30c42c12e0560acccf25b00229c8 SHA512
13c3728b2c8f65d8795163aa95bcfc3e7a7875e1a360c283f7ceeb29bda2ef7060323f31b34dd885820294e836fa255c1433d250b7828081b1b14074e2e1e786
WHIRLPOOL
0697e087d393802545ac1163aa96a387f90adf99975f57013f5f73553a61906f3ec87460584d4e66ea3c7864b0195222e190997618cd4babe20f0fd81327bfcb
+DIST renpy-6.99.6-source.tar.bz2 27289290 SHA256
31f3fc84bda7e4048a97539d6266b3fbb18a82fc38db83761dd4771f5ef98d04 SHA512
d018ac0827ee5a914c48479174eccbf3968ea22926638e09ee00ecea49dc0111b4f24810ad32d5a8bb8012ff18e5fb8981705ed0e2289ce3172a1629e095a651
WHIRLPOOL
ba8102e11a09b70100d391c5b068c826db810486f2792c5b5214421b09344916888255a377ac26b2b21aaede315bb0470c7315c2581af9e64b545d68ee6f005c
diff --git a/games-engines/renpy/files/renpy-6.18.3-multiple-abi.patch
b/games-engines/renpy/files/renpy-6.99.6-multiple-abi.patch
similarity index 64%
rename from games-engines/renpy/files/renpy-6.18.3-multiple-abi.patch
rename to games-engines/renpy/files/renpy-6.99.6-multiple-abi.patch
index a569fa4..eac6512 100644
--- a/games-engines/renpy/files/renpy-6.18.3-multiple-abi.patch
+++ b/games-engines/renpy/files/renpy-6.99.6-multiple-abi.patch
@@ -1,14 +1,24 @@
-Author: hasufell <[email protected]>
-Date: Tue Jan 21 01:02:00 2014 +0100
+From 7aa51dae5eb2f2123fee9bca23a2ce2f1b1c3f10 Mon Sep 17 00:00:00 2001
+From: hasufell <[email protected]>
+Date: Thu, 20 Aug 2015 01:10:58 +0200
+Subject: [PATCH] Fix multiple abi support
- fix multiple abi support
+---
+ renpy.py | 128 ++--------------------------------------------------
+ renpy/common.py | 137 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ renpy/main.py | 6 +--
+ 3 files changed, 144 insertions(+), 127 deletions(-)
+ create mode 100644 renpy/common.py
---- renpy.py
-+++ renpy.py
-@@ -29,92 +29,9 @@
+diff --git a/renpy.py b/renpy.py
+index 7548cf6..8ec7353 100644
+--- a/renpy.py
++++ b/renpy.py
+@@ -28,118 +28,9 @@
+ import os
import sys
import warnings
-
+-
-# Functions to be customized by distributors. ################################
-
-# Given the Ren'Py base directory (usually the directory containing
@@ -18,9 +28,12 @@ Date: Tue Jan 21 01:02:00 2014 +0100
-
-# 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):
+-def path_to_saves(gamedir, save_directory=None):
- import renpy #@UnresolvedImport
-
+- if save_directory is None:
+- save_directory = renpy.config.save_directory
+-
- # Makes sure the permissions are right on the save directory.
- def test_writable(d):
- try:
@@ -45,15 +58,37 @@ Date: Tue Jan 21 01:02:00 2014 +0100
- if os.path.isdir(rv) and test_writable(rv):
- break
-
-- print "Using savedir", rv
+- print "Saving to", rv
-
- # We return the last path as the default.
-
- return rv
-
+- if renpy.ios:
+- from pyobjus import autoclass
+- from pyobjus.objc_py_types import enum
+-
+- NSSearchPathDirectory = enum("NSSearchPathDirectory",
NSDocumentDirectory=9)
+- NSSearchPathDomainMask = enum("NSSearchPathDomainMask",
NSUserDomainMask=1)
+-
+- NSFileManager = autoclass('NSFileManager')
+- manager = NSFileManager.defaultManager()
+- url = manager.URLsForDirectory_inDomains_(
+- NSSearchPathDirectory.NSDocumentDirectory,
+- NSSearchPathDomainMask.NSUserDomainMask,
+- ).lastObject()
+-
+- # url.path seems to change type based on iOS version, for some reason.
+- try:
+- rv = url.path().UTF8String().decode("utf-8")
+- except:
+- rv = url.path.UTF8String().decode("utf-8")
+-
+- print "Saving to", rv
+- return rv
-
- # No save directory given.
-- if not renpy.config.save_directory:
+- if not save_directory:
- return gamedir + "/saves"
-
- # Search the path above Ren'Py for a directory named "Ren'Py Data".
@@ -62,7 +97,7 @@ Date: Tue Jan 21 01:02:00 2014 +0100
-
- while True:
- if os.path.isdir(path + "/Ren'Py Data"):
-- return path + "/Ren'Py Data/" + renpy.config.save_directory
+- return path + "/Ren'Py Data/" + save_directory
-
- newpath = os.path.dirname(path)
- if path == newpath:
@@ -71,18 +106,18 @@ Date: Tue Jan 21 01:02:00 2014 +0100
-
- # Otherwise, put the saves in a platform-specific location.
- if renpy.macintosh:
-- rv = "~/Library/RenPy/" + renpy.config.save_directory
+- rv = "~/Library/RenPy/" + save_directory
- return os.path.expanduser(rv)
-
- elif renpy.windows:
- if 'APPDATA' in os.environ:
-- return os.environ['APPDATA'] + "/RenPy/" +
renpy.config.save_directory
+- return os.environ['APPDATA'] + "/RenPy/" + save_directory
- else:
- rv = "~/RenPy/" + renpy.config.save_directory
- return os.path.expanduser(rv)
-
- else:
-- rv = "~/.renpy/" + renpy.config.save_directory
+- rv = "~/.renpy/" + save_directory
- return os.path.expanduser(rv)
-
-
@@ -101,8 +136,21 @@ Date: Tue Jan 21 01:02:00 2014 +0100
# The version of the Mac Launcher and py4renpy that we require.
macos_version = (6, 14, 0)
-@@ -142,7 +59,7 @@
+@@ -154,20 +45,9 @@ except:
+ print "Ren'Py requires at least python 2.6."
+ sys.exit(0)
+-android = ("ANDROID_PRIVATE" in os.environ)
+-
+-# Android requires us to add code to the main module, and to command some
+-# renderers.
+-if android:
+- __main__ = sys.modules["__main__"]
+- __main__.path_to_renpy_base = path_to_renpy_base
+- __main__.path_to_common = path_to_common
+- __main__.path_to_saves = path_to_saves
+- os.environ["RENPY_RENDERER"] = "gl"
+-
def main():
- renpy_base = path_to_renpy_base()
@@ -110,13 +158,16 @@ Date: Tue Jan 21 01:02:00 2014 +0100
# 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..0d60e36
--- /dev/null
-+++ renpy/common.py
-@@ -0,0 +1,127 @@
++++ b/renpy/common.py
+@@ -0,0 +1,137 @@
+# 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 <[email protected]>
++# Copyright 2004-2015 Tom Rothamel <[email protected]>
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation files
@@ -142,8 +193,6 @@ Date: Tue Jan 21 01:02:00 2014 +0100
+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):
@@ -151,20 +200,11 @@ Date: Tue Jan 21 01:02:00 2014 +0100
+
+# 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):
++def path_to_saves(gamedir, save_directory=None):
+ import renpy #@UnresolvedImport
+
-+ # Makes sure the permissions are right on the save directory.
-+ def test_writable(d):
-+ try:
-+ fn = os.path.join(d, "test.txt")
-+ open(fn, "w").close()
-+ open(fn, "r").close()
-+ os.unlink(fn)
-+ return True
-+ except:
-+ return False
-+
++ if save_directory is None:
++ save_directory = renpy.config.save_directory
+
+ # Makes sure the permissions are right on the save directory.
+ def test_writable(d):
@@ -178,7 +218,6 @@ Date: Tue Jan 21 01:02:00 2014 +0100
+ return False
+
+
-+
+ # Android.
+ if renpy.android:
+ paths = [
@@ -191,15 +230,37 @@ Date: Tue Jan 21 01:02:00 2014 +0100
+ if os.path.isdir(rv) and test_writable(rv):
+ break
+
-+ print "Using savedir", rv
++ print "Saving to", rv
+
+ # We return the last path as the default.
+
+ return rv
+
++ if renpy.ios:
++ from pyobjus import autoclass
++ from pyobjus.objc_py_types import enum
++
++ NSSearchPathDirectory = enum("NSSearchPathDirectory",
NSDocumentDirectory=9)
++ NSSearchPathDomainMask = enum("NSSearchPathDomainMask",
NSUserDomainMask=1)
++
++ NSFileManager = autoclass('NSFileManager')
++ manager = NSFileManager.defaultManager()
++ url = manager.URLsForDirectory_inDomains_(
++ NSSearchPathDirectory.NSDocumentDirectory,
++ NSSearchPathDomainMask.NSUserDomainMask,
++ ).lastObject()
++
++ # url.path seems to change type based on iOS version, for some reason.
++ try:
++ rv = url.path().UTF8String().decode("utf-8")
++ except:
++ rv = url.path.UTF8String().decode("utf-8")
++
++ print "Saving to", rv
++ return rv
+
+ # No save directory given.
-+ if not renpy.config.save_directory:
++ if not save_directory:
+ return gamedir + "/saves"
+
+ # Search the path above Ren'Py for a directory named "Ren'Py Data".
@@ -208,7 +269,7 @@ Date: Tue Jan 21 01:02:00 2014 +0100
+
+ while True:
+ if os.path.isdir(path + "/Ren'Py Data"):
-+ return path + "/Ren'Py Data/" + renpy.config.save_directory
++ return path + "/Ren'Py Data/" + save_directory
+
+ newpath = os.path.dirname(path)
+ if path == newpath:
@@ -217,18 +278,18 @@ Date: Tue Jan 21 01:02:00 2014 +0100
+
+ # Otherwise, put the saves in a platform-specific location.
+ if renpy.macintosh:
-+ rv = "~/Library/RenPy/" + renpy.config.save_directory
++ rv = "~/Library/RenPy/" + save_directory
+ return os.path.expanduser(rv)
+
+ elif renpy.windows:
+ if 'APPDATA' in os.environ:
-+ return os.environ['APPDATA'] + "/RenPy/" +
renpy.config.save_directory
++ return os.environ['APPDATA'] + "/RenPy/" + save_directory
+ else:
+ rv = "~/RenPy/" + renpy.config.save_directory
+ return os.path.expanduser(rv)
+
+ else:
-+ rv = "~/.renpy/" + renpy.config.save_directory
++ rv = "~/.renpy/" + save_directory
+ return os.path.expanduser(rv)
+
+
@@ -240,9 +301,11 @@ Date: Tue Jan 21 01:02:00 2014 +0100
+ renpy_base = os.path.abspath(renpy_base)
+
+ return renpy_base
---- renpy/main.py
-+++ renpy/main.py
-@@ -25,7 +25,7 @@ import os
+diff --git a/renpy/main.py b/renpy/main.py
+index 73e7239..6807ba1 100644
+--- a/renpy/main.py
++++ b/renpy/main.py
+@@ -27,7 +27,7 @@ import os
import sys
import time
import zipfile
@@ -250,8 +313,8 @@ Date: Tue Jan 21 01:02:00 2014 +0100
+import renpy.common as common
- def run(restart):
-@@ -167,7 +167,7 @@ def main():
+ last_clock = time.time()
+@@ -273,7 +273,7 @@ def main():
renpy.config.searchpath = [ renpy.config.gamedir ]
# Find the common directory.
@@ -260,7 +323,7 @@ Date: Tue Jan 21 01:02:00 2014 +0100
if os.path.isdir(commondir):
renpy.config.searchpath.append(commondir)
-@@ -230,7 +230,7 @@ def main():
+@@ -371,7 +371,7 @@ def main():
# Find the save directory.
if renpy.config.savedir is None:
@@ -269,3 +332,6 @@ Date: Tue Jan 21 01:02:00 2014 +0100
if renpy.game.args.savedir: #@UndefinedVariable
renpy.config.savedir = renpy.game.args.savedir #@UndefinedVariable
+--
+2.5.0
+
diff --git a/games-engines/renpy/metadata.xml b/games-engines/renpy/metadata.xml
index 81a8e71..378b172 100644
--- a/games-engines/renpy/metadata.xml
+++ b/games-engines/renpy/metadata.xml
@@ -1,18 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
<pkgmetadata>
- <herd>games</herd>
- <herd>proxy-maintainers</herd>
- <maintainer>
+ <maintainer type="person">
<email>[email protected]</email>
<name>Julian Ospald</name>
<description>Maintainer. Assign bugs to him</description>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>[email protected]</email>
<name>Maks Verver</name>
<description>Proxy maintainer. CC him on bugs</description>
</maintainer>
+ <maintainer type="project">
+ <email>[email protected]</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>[email protected]</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription>
Ren'Py is a free and cross-platform visual novel engine that
helps you use words,
@@ -22,18 +28,17 @@
while its Python support allows for complex simulation games.
</longdescription>
<use>
- <flag name='development'>Install IDE for game developers and
+ <flag name="development">Install IDE for game developers and
an empty game template</flag>
</use>
<upstream>
- <maintainer status='active'>
+ <maintainer status="active">
<email>[email protected]</email>
<name>Tom Rothamel</name>
</maintainer>
<changelog>http://www.renpy.org/latest.html</changelog>
<bugs-to>https://github.com/renpy/renpy/issues</bugs-to>
<doc>http://renpy.org/wiki/renpy/doc</doc>
- <remote-id type='github'>renpy/renpy</remote-id>
+ <remote-id type="github">renpy/renpy</remote-id>
</upstream>
</pkgmetadata>
-
diff --git a/games-engines/renpy/renpy-6.18.3.ebuild
b/games-engines/renpy/renpy-6.99.6.ebuild
similarity index 90%
rename from games-engines/renpy/renpy-6.18.3.ebuild
rename to games-engines/renpy/renpy-6.99.6.ebuild
index 83cbf29..28b4259 100644
--- a/games-engines/renpy/renpy-6.18.3.ebuild
+++ b/games-engines/renpy/renpy-6.99.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/renpy/renpy-6.18.3.ebuild,v
1.2 2015/03/31 19:25:35 ulm Exp $
+# $Id$
EAPI=5
PYTHON_COMPAT=( python2_7 )
@@ -19,13 +19,13 @@ IUSE="development doc examples"
REQUIRED_USE="examples? ( development )"
RDEPEND="
- >=app-eselect/eselect-renpy-0.5
+ >=app-eselect/eselect-renpy-0.6
dev-libs/fribidi
- dev-python/pygame[X,${PYTHON_USEDEP}]
+ ~dev-python/pygame_sdl2-${PV}[${PYTHON_USEDEP}]
>=dev-lang/python-exec-0.3[${PYTHON_USEDEP}]
media-libs/glew
media-libs/libpng:0
- media-libs/libsdl[X,video]
+ media-libs/libsdl2[video]
media-libs/freetype:2
sys-libs/zlib
virtual/ffmpeg"
