From 8aebb228036d5e2863b7eaa6e319ab41c1669269 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 16 Apr 2018 16:47:37 +0100 Subject: gentoo resync : 16.04.2018 --- games-engines/renpy/Manifest | 3 - .../renpy/files/renpy-6.17.7-multiple-abi.patch | 245 --------------------- games-engines/renpy/renpy-6.17.7.ebuild | 110 --------- 3 files changed, 358 deletions(-) delete mode 100644 games-engines/renpy/files/renpy-6.17.7-multiple-abi.patch delete mode 100644 games-engines/renpy/renpy-6.17.7.ebuild (limited to 'games-engines/renpy') diff --git a/games-engines/renpy/Manifest b/games-engines/renpy/Manifest index 3905a2a207f6..0ed3c48c4c4a 100644 --- a/games-engines/renpy/Manifest +++ b/games-engines/renpy/Manifest @@ -1,11 +1,8 @@ -AUX renpy-6.17.7-multiple-abi.patch 8291 BLAKE2B ed73614da837737fc9f71fedfb6c72f0d5159ac3b87a7bac1abbeaa3a8ee25649fb8afe8e36de52f399b732973abb6a773ccce6f9d166fbe94a989901abeb141 SHA512 fd39773b85a54ca709f412430654cacdc91caaa561ad2e15bb02b08b971997062fa3c1adad5e2b582a2dc7acc9886b717517e0c10c0bab6a36fd05e52e98edf9 AUX renpy-6.99.12.4-compat-infinite-loop.patch 1612 BLAKE2B e6c3a794e4cc94c6a4938290c428117d7b6288058a9d1faf3a0df8501bf30f3b7ef9bee266acf5bf14d1841122e3d05ac2fd66bbcc03b9aa0e18ffb7a1fbc416 SHA512 86cdba778680b46434c49bba345c37d626888d85c24c4f801396fed160d05607ae6c761cd9930b054e09f8a2d107a4ca05f1e5eed0dc4f51ea4ac2625f8cc77a AUX renpy-6.99.12.4-compat-style.patch 1964 BLAKE2B cea736433c1b7248c2e1a38b10cd904ef756378abd6dcf520a72c13f38a0b08511df412b4d320788b80e052d1a924e5703ffdfa7e28933d85b247359f55b467d SHA512 199297d0841dd0212708bfbf3aa1950a6c7ba623da156994f09b73f3e797662ad92f85d40c896169d3643be2f20e2deb91357ed8f8c668ad06140b0f582650a5 AUX renpy-6.99.12.4-compat-window.patch 2488 BLAKE2B 37b8a2145f548fa0e3a569ac290884f68084fcedfd355f8256ef2b98108c4fe393f14ba7f23343c6ed76e481c6e2a721f4aeaaaefd1b4c2b14c2fd6f0ec97a08 SHA512 238d727750b114bd9e68b8d144adab0c470defcd386bd934d2c830f15947718d7dfa5001ef92733a0c3a7ac4b40ca459243b0c68ff8239b960290840d3d7dbf2 AUX renpy-6.99.12.4-multiple-abi.patch 11945 BLAKE2B 97b4d69a820c5147a64cedd3a677223510952c8b47c3cc05817c193b7d43bbc919436d5bc66e8c9981a676d0ad8a614d0e35a8cabd054e7e6e161b7badc0f154 SHA512 4ff4926ba5e92b2e72e206093a770b5d334a0c25fd4ace48c54b0ec6d8dfcb64a137f97238793703af927906d2df0723d2e36920ed50c6686fe8ba3602880759 AUX renpy.1 4642 BLAKE2B 446100972a1cb82dd91a25bb03895bdf717f33d1ffa27497a1e71ec561a1cb3ef986962943d890e209231b788d141a5ab86fdbefbc01a8f1c760b998e1b99a46 SHA512 2727a6ff9675a2b82a979faf5d75e7b3b96915f4c7382d22bba35d74674e613f45d4e8437e24edb410aac45cd8d219cc68e118387e538aafb32b0c312443b066 -DIST renpy-6.17.7-source.tar.bz2 17932988 BLAKE2B 55a955a086356f0a1136d5dae18dbcd99edd6403d2d37e09f9b2d0e1c0ec137be993082a98b444c91e943a7100d806adc40d8a05d8525f841cf90a2f1e00b3d3 SHA512 22b0e08b18ee35317b11451205233cbd8a29617d9c3d298bbdcfc5757f67c2f0e4c8a748aa83d5c8b43786c062ffca109d07e981efa750fcee26f45f08a33ea2 DIST renpy-6.99.12.4-source.tar.bz2 18192453 BLAKE2B eb00db04fc6ed0aafa0428c3ba0ffe986634f8b536a7cd6c88c6082789554f6d9631f433baa3e34ab91d19509ccef5617e3fe8ec410b96f4b87d489656cc893b SHA512 375b67e15630fc21915136e70bc93db6da7c2da192d39b1256822513ae44974124522c85f1976f2af62df27b5fa11493af488b02abcf0081eeae03e1a69dfca5 -EBUILD renpy-6.17.7.ebuild 2523 BLAKE2B 2bbafd7ccda7633ef5ccd0d62aa30846c735c1f24ee899fe4101f25a9bc1c7135c3be0e28c66ef2a815e566c10c73bfa134e13f8ef46b4b15225b4e22ab1fad1 SHA512 3cbb3ba7d175aadbecdeef324fa65f7d37dc596860c9127d650ba32403a7ca4cbc40eee458c3f0ec09953e4bce3de46bba028c50f4e6954ff5ce4a9c87cd437f EBUILD renpy-6.99.12.4-r3.ebuild 2600 BLAKE2B c3c5a18a8c0690ab7f842a3e9d52ded8e1db1cd2901ad0356069bcb6837b614c88d3965c7a26d3f61ff772b4a5189949c72e2146c2195039d79d107904f8e43f SHA512 e5d8187c6a2c57212adfa7b24e0939facba7e53ef9308aa29cbdb3a07b1711ef2e233fb24463ef850babf01b27109b435253eb47601f874b3ad3e414a70cfeff MISC metadata.xml 1063 BLAKE2B 397a9759c24976baaf19f8603b716edbaaa67c6c1ebb4fa9d971004a05d3b61a1b7fef806b7964b23c9f37c6f91dd3f22c5ae5ee007a760183ffa3cdcf5f4253 SHA512 801640d22f7d54fa918564d14aa0bfbd63c6f106dd1ff690740b93bb7da51012c42b4b75431e3741c47049121bcfb908c3a1cde6b41091b51079c5f0cacc0753 diff --git a/games-engines/renpy/files/renpy-6.17.7-multiple-abi.patch b/games-engines/renpy/files/renpy-6.17.7-multiple-abi.patch deleted file mode 100644 index 335af4e9b8d1..000000000000 --- a/games-engines/renpy/files/renpy-6.17.7-multiple-abi.patch +++ /dev/null @@ -1,245 +0,0 @@ -commit 7451ba936ca2f3358ca51ab562371774199c7052 -Author: hasufell -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 -+# -+# 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.7.ebuild b/games-engines/renpy/renpy-6.17.7.ebuild deleted file mode 100644 index 07642c3817c7..000000000000 --- a/games-engines/renpy/renpy-6.17.7.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2018 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 - -DESCRIPTION="Visual novel engine written in python" -HOMEPAGE="https://www.renpy.org" -SRC_URI="https://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-eselect/eselect-renpy-0.4 - dev-libs/fribidi - dev-python/pygame[X,${PYTHON_USEDEP}] - >=dev-lang/python-exec-0.3[${PYTHON_USEDEP}] - media-libs/glew:0 - 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 -} -- cgit v1.2.3