From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C4F6E139694 for ; Sat, 15 Jul 2017 23:25:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0CDBD1FC007; Sat, 15 Jul 2017 23:25:07 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CCEE41FC007 for ; Sat, 15 Jul 2017 23:25:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2E8DD341948 for ; Sat, 15 Jul 2017 23:25:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 00F8B7488 for ; Sat, 15 Jul 2017 23:25:03 +0000 (UTC) From: "Andrew Savchenko" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Savchenko" Message-ID: <1500160941.9a1bcce1539cf2b1107865cb5b77eb189ac3344c.bircoph@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-engines/renpy/files/, games-engines/renpy/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-engines/renpy/Manifest games-engines/renpy/files/renpy-6.99.12.4-multiple-abi.patch games-engines/renpy/files/renpy.1 games-engines/renpy/renpy-6.17.7.ebuild games-engines/renpy/renpy-6.99.12.4.ebuild games-engines/renpy/renpy-6.99.6.ebuild X-VCS-Directories: games-engines/renpy/ games-engines/renpy/files/ X-VCS-Committer: bircoph X-VCS-Committer-Name: Andrew Savchenko X-VCS-Revision: 9a1bcce1539cf2b1107865cb5b77eb189ac3344c X-VCS-Branch: master Date: Sat, 15 Jul 2017 23:25:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ff7193d8-a81a-480b-9dba-ba2061f034fa X-Archives-Hash: dba8710bb4a8715223f64faf47557cf4 commit: 9a1bcce1539cf2b1107865cb5b77eb189ac3344c Author: Andrew Savchenko gentoo org> AuthorDate: Sat Jul 15 23:21:39 2017 +0000 Commit: Andrew Savchenko gentoo org> CommitDate: Sat Jul 15 23:22:21 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a1bcce1 games-engines/renpy: version bump Fixes bugs 587872 and 575086. Package-Manager: Portage-2.3.6, Repoman-2.3.2 Signed-off-by: Andrew Savchenko gentoo.org> games-engines/renpy/Manifest | 1 + .../renpy/files/renpy-6.99.12.4-multiple-abi.patch | 357 +++++++++++++++++++++ games-engines/renpy/files/renpy.1 | 163 ++++++++++ games-engines/renpy/renpy-6.17.7.ebuild | 4 +- ...{renpy-6.99.6.ebuild => renpy-6.99.12.4.ebuild} | 11 +- games-engines/renpy/renpy-6.99.6.ebuild | 4 +- 6 files changed, 532 insertions(+), 8 deletions(-) diff --git a/games-engines/renpy/Manifest b/games-engines/renpy/Manifest index 4d65ed544f0..cadcd3c3f46 100644 --- a/games-engines/renpy/Manifest +++ b/games-engines/renpy/Manifest @@ -1,2 +1,3 @@ DIST renpy-6.17.7-source.tar.bz2 17932988 SHA256 fef01de9e482b73d9d409de7a43bada6dd3e2a0549b99dd487306371190ed038 SHA512 22b0e08b18ee35317b11451205233cbd8a29617d9c3d298bbdcfc5757f67c2f0e4c8a748aa83d5c8b43786c062ffca109d07e981efa750fcee26f45f08a33ea2 WHIRLPOOL fef82eb6c958a2525797e5d8bfae3488fba606b70eeed5c94f7afcab4fa46e7a7eb43d91b4bd55f553b65a72b12236e02ecdee55e8852c1fafc055332f9d131d +DIST renpy-6.99.12.4-source.tar.bz2 18192453 SHA256 65d8c97acfce7a8025ad0f6a1a3d5ef88d4319ece02370f33cf7a791b320a30c SHA512 375b67e15630fc21915136e70bc93db6da7c2da192d39b1256822513ae44974124522c85f1976f2af62df27b5fa11493af488b02abcf0081eeae03e1a69dfca5 WHIRLPOOL 3044bcd5e241e95c8313a16da4049f71621def4669b9d76aa6892191443456e2c388f7a7aaa16a01e073311a83d1bde5452fc3e57f956571bfca2edc1db93ca9 DIST renpy-6.99.6-source.tar.bz2 27289290 SHA256 31f3fc84bda7e4048a97539d6266b3fbb18a82fc38db83761dd4771f5ef98d04 SHA512 d018ac0827ee5a914c48479174eccbf3968ea22926638e09ee00ecea49dc0111b4f24810ad32d5a8bb8012ff18e5fb8981705ed0e2289ce3172a1629e095a651 WHIRLPOOL ba8102e11a09b70100d391c5b068c826db810486f2792c5b5214421b09344916888255a377ac26b2b21aaede315bb0470c7315c2581af9e64b545d68ee6f005c diff --git a/games-engines/renpy/files/renpy-6.99.12.4-multiple-abi.patch b/games-engines/renpy/files/renpy-6.99.12.4-multiple-abi.patch new file mode 100644 index 00000000000..3a7355e60be --- /dev/null +++ b/games-engines/renpy/files/renpy-6.99.12.4-multiple-abi.patch @@ -0,0 +1,357 @@ +From 7aa51dae5eb2f2123fee9bca23a2ce2f1b1c3f10 Mon Sep 17 00:00:00 2001 +From: hasufell +Date: Thu, 20 Aug 2015 01:10:58 +0200 +Subject: [PATCH] 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 + +diff --git a/renpy.py b/renpy.py +index 7548cf6..8ec7353 100644 +--- a/renpy.py ++++ b/renpy.py +@@ -28,122 +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, save_directory=None): +- import renpy # @UnresolvedImport +- +- if save_directory is None: +- save_directory = renpy.config.save_directory +- save_directory = renpy.exports.fsencode(save_directory) +- +- # 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 +- +- # 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) and test_writable(rv): +- break +- +- 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 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/" + 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/" + save_directory +- return os.path.expanduser(rv) +- +- elif renpy.windows: +- if 'APPDATA' in os.environ: +- return os.environ['APPDATA'] + "/RenPy/" + save_directory +- else: +- rv = "~/RenPy/" + renpy.config.save_directory +- return os.path.expanduser(rv) +- +- else: +- rv = "~/.renpy/" + 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.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) +@@ -154,21 +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() ++ 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..0d60e36 +--- /dev/null ++++ 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-2015 Tom Rothamel ++# ++# 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 ++ ++# 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, 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: ++ fn = os.path.join(d, "test.txt") ++ open(fn, "w").close() ++ open(fn, "r").close() ++ os.unlink(fn) ++ return True ++ except: ++ return False ++ ++ ++ # 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) and test_writable(rv): ++ break ++ ++ 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 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/" + 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/" + save_directory ++ return os.path.expanduser(rv) ++ ++ elif renpy.windows: ++ if 'APPDATA' in os.environ: ++ return os.environ['APPDATA'] + "/RenPy/" + save_directory ++ else: ++ rv = "~/RenPy/" + renpy.config.save_directory ++ return os.path.expanduser(rv) ++ ++ else: ++ rv = "~/.renpy/" + 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.path.abspath(renpy_base) ++ ++ return renpy_base +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 +-import __main__ ++import renpy.common as common + + + last_clock = time.time() +@@ -273,7 +273,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) +@@ -371,7 +371,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/renpy/script.py b/renpy/script.py +index 73e7239..6807ba1 100644 +--- a/renpy/script.py ++++ b/renpy/script.py +@@ -150,8 +150,8 @@ import os + if renpy.loader.loadable(i): + return None + +- import __main__ +- backups = __main__.path_to_saves(renpy.config.gamedir, "backups") # @UndefinedVariable ++ import renpy.common as common ++ backups = common.path_to_saves(renpy.config.gamedir, "backups") # @UndefinedVariable + + if backups is None: + return +-- +2.5.0 + diff --git a/games-engines/renpy/files/renpy.1 b/games-engines/renpy/files/renpy.1 new file mode 100644 index 00000000000..e8b7a2b6195 --- /dev/null +++ b/games-engines/renpy/files/renpy.1 @@ -0,0 +1,163 @@ +.\" Copyright © 2015 Andrew Savchenko +.\" Distributed under the terms of GNU FDL-1.3+ license, +.\" based on original Ren'Py documentation licensed under MIT. +.TH renpy 1 "31 May 2015" "Ren'Py" "Ren'Py Gentoo's manual" +.SH NAME +renpy \- a visual novel engine + +.SH SYNOPSIS +.BI renpy " game_directory" +.\" **************************************************************** +.SH DESCRIPTION + +.B renpy +(Ren'Py) is a visual novel engine \- used by hundreds of creators +from around the world \- that helps you use words, images, and +sounds to tell interactive stories that run on computers and mobile +devices. These can be both visual novels and life simulation games. +The easy to learn script language allows anyone to efficiently +write large visual novels, while its +.BR python (1) +scripting is enough for complex simulation games. +.\" **************************************************************** +.SH RUNNING A GAME + +In order to run a game, provide +.I game_directory +as an argument to +.BR renpy . +Exact directory name may vary depending or a game, but usually +this path corresponds to +.I */game +wildcard and contains +.I script_version.rpy* +file within. Game directory usually contains other +.IR *.rpy* " and " *.rpa " files." + +One may use +.BR find (1) +tool to locate required directory within unpacked game top +directory: +.RS + +find -O3 +.I top_directory +-type f -iname "script_version.rpy*" + +.RE +A directory one level above may be provided as an argument as well. +.\" **************************************************************** +.SH PORTABILITY + +All +.B renpy +games are written in +.BR python (1), +so one can run then on any platform and architecture. + +As you may have noticed, Ren'Py games are often distributed in +different archives for different architectures. This happens due to +bundling of +.BR python (1) +interpreter and required libraries in a game's tarball. Since you +are using OS native +.B renpy +setup, you should be able to run any of these games. +.\" **************************************************************** +.SH GAMES CATALOGUE + +A large catalogue of Ren'Py powered games is available at +.IR http://games.renpy.org/ . +.\" **************************************************************** +.SH TROUBLESHOOTING + +In some cases game may fail to run with current +.B renpy +version due to various errors. + +In such case please try to use the closest +.B renpy +version to one used by game developer. Most games contain +.IR script_version.rpy " file in the " game " directory." +This file actually contains +.B renpy +version used during a game build. +You may install multiple slots of +.B renpy +in Gentoo and use +.BI eselect " renpy" +module to switch between various versions. + +If +.I game +directory contains both +.IR *.rpyc " (or " *.rpyo ") and " *.rpy " files, delete" +.IR *.rpyc " (or " *.rpyo ") files, they will be regenerated by" +the interpreter. +Another solution will be to switch between version of +.BR python (1) +using +.IR eselect (1) +tool in order to find one suitable to interpret game's +.IR *.rpyc " files." + +Some games may lack general media files, e.g. +.I click.ogg +sound, so you should create or download one and place in the +.I game +directory. + +Also please pay attention to +.I problems.html +page from +.B renpy +html documentation, see +.B FURTHER READING +section. +.\" **************************************************************** +.SH ENVIRONMENT VARIABLES + +.B renpy +supports a number of environment variables to control its +behaviour. Please refer to html docs for further details +(see +.B FURTHER READING +section). +.\" **************************************************************** +.SH FURTHER READING + +.B renpy +comes with extensive html documentation. To use it install +.B renpy +with +.I USE="doc" +and go to +.I /usr/share/doc/renpy-*/html/doc/index.html + +Alternatively one may refer to online documentation: +.IR http://www.renpy.org/doc/html/ . +Be warned that online docs maybe different from your current active +version, so it recommended to use shipped documentation instead. +.\" **************************************************************** +.SH BUGS + +Any bugs related to Gentoo packaging (e.g. omitted dependencies) +please report on bugzilla: +.IR https://bugs.gentoo.org . + +For bugs in the Ren'Py engine itself, please contact upstream: +.I https://github.com/renpy/renpy/issues +and add a Gentoo bug if you feel it necessary. + +For issues with games themselves please contact corresponding +authors. +.\" **************************************************************** +.SH SEE ALSO + +.BR python (1) +\- an interpreter used by Ren'Py engine. + +.BR unrpa (1) +\- a tool to unpack +.I *.rpa +data files (Ren'Py Archives). diff --git a/games-engines/renpy/renpy-6.17.7.ebuild b/games-engines/renpy/renpy-6.17.7.ebuild index cbec515c2df..adc56df5074 100644 --- a/games-engines/renpy/renpy-6.17.7.ebuild +++ b/games-engines/renpy/renpy-6.17.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -22,7 +22,7 @@ RDEPEND=" dev-libs/fribidi dev-python/pygame[X,${PYTHON_USEDEP}] >=dev-lang/python-exec-0.3[${PYTHON_USEDEP}] - media-libs/glew + media-libs/glew:0 media-libs/libpng:0 media-libs/libsdl[X,video] media-libs/freetype:2 diff --git a/games-engines/renpy/renpy-6.99.6.ebuild b/games-engines/renpy/renpy-6.99.12.4.ebuild similarity index 90% copy from games-engines/renpy/renpy-6.99.6.ebuild copy to games-engines/renpy/renpy-6.99.12.4.ebuild index f48dc71d912..4a72ef4cb2b 100644 --- a/games-engines/renpy/renpy-6.99.6.ebuild +++ b/games-engines/renpy/renpy-6.99.12.4.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 PYTHON_COMPAT=( python2_7 ) DISTUTILS_IN_SOURCE_BUILD=1 -inherit eutils toolchain-funcs python-r1 versionator gnome2-utils games distutils-r1 +inherit eutils games gnome2-utils toolchain-funcs versionator distutils-r1 DESCRIPTION="Visual novel engine written in python" HOMEPAGE="http://www.renpy.org" @@ -22,7 +22,7 @@ RDEPEND=" dev-libs/fribidi ~dev-python/pygame_sdl2-${PV}[${PYTHON_USEDEP}] >=dev-lang/python-exec-0.3[${PYTHON_USEDEP}] - media-libs/glew + media-libs/glew:0 media-libs/libpng:0 media-libs/libsdl2[video] media-libs/freetype:2 @@ -77,14 +77,17 @@ python_install() { } python_install_all() { + distutils-r1_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 + insinto html + doins -r doc fi + newman "${FILESDIR}/${PN}.1" "${P}.1" prepgamesdirs } diff --git a/games-engines/renpy/renpy-6.99.6.ebuild b/games-engines/renpy/renpy-6.99.6.ebuild index f48dc71d912..063e7bf634c 100644 --- a/games-engines/renpy/renpy-6.99.6.ebuild +++ b/games-engines/renpy/renpy-6.99.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -22,7 +22,7 @@ RDEPEND=" dev-libs/fribidi ~dev-python/pygame_sdl2-${PV}[${PYTHON_USEDEP}] >=dev-lang/python-exec-0.3[${PYTHON_USEDEP}] - media-libs/glew + media-libs/glew:0 media-libs/libpng:0 media-libs/libsdl2[video] media-libs/freetype:2