From 74280ef46c26f3516ac3c18a590d7367f2d8a8cd Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Mon, 1 Apr 2013 12:41:14 +0000 Subject: version bump Package-Manager: portage-2.2.0_alpha170/cvs/Linux x86_64 Manifest-Sign-Key: 0xE73C35B3 --- games-engines/renpy/ChangeLog | 8 +- games-engines/renpy/Manifest | 19 +- .../renpy/files/renpy-6.15.3-multiple-abi.patch | 219 +++++++++++++++++++++ games-engines/renpy/renpy-6.15.3.ebuild | 111 +++++++++++ 4 files changed, 348 insertions(+), 9 deletions(-) create mode 100644 games-engines/renpy/files/renpy-6.15.3-multiple-abi.patch create mode 100644 games-engines/renpy/renpy-6.15.3.ebuild (limited to 'games-engines/renpy') diff --git a/games-engines/renpy/ChangeLog b/games-engines/renpy/ChangeLog index bcfade115159..6c4efce271f2 100644 --- a/games-engines/renpy/ChangeLog +++ b/games-engines/renpy/ChangeLog @@ -1,6 +1,12 @@ # 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.7 2013/03/29 23:49:34 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-engines/renpy/ChangeLog,v 1.8 2013/04/01 12:41:09 hasufell Exp $ + +*renpy-6.15.3 (01 Apr 2013) + + 01 Apr 2013; Julian Ospald +renpy-6.15.3.ebuild, + +files/renpy-6.15.3-multiple-abi.patch: + version bump *renpy-6.15.2 (29 Mar 2013) diff --git a/games-engines/renpy/Manifest b/games-engines/renpy/Manifest index 0aa3b8e24fab..fbd54864ea37 100644 --- a/games-engines/renpy/Manifest +++ b/games-engines/renpy/Manifest @@ -5,20 +5,23 @@ AUX renpy-6.14.1-av_close_input_stream.patch 291 SHA256 da5d69dadb0c8559f20b2059 AUX renpy-6.14.1-multiple-abi.patch 7950 SHA256 7605357e2fb692acc0032380ebaff4d153d4cae139b8b6298cbcd347f8880838 SHA512 1673cb44bb168745b6eeb770ca4bc88ca0c72ded4e325bedb5fb5ea90147276bfe63bd5607441560e5aa1dbaf93820fe3e77f853716b24f5eaa80ad8ab2e9008 WHIRLPOOL 330aa2c6ed0a5f54f8523fffbc5f503d7497f756c776620d91981be89d90737f16114b331662ce300720039b847d34d3df13dd19c039e7dca851784a962d0722 AUX renpy-6.14.1-remove-AVFormatParameters.patch 494 SHA256 3e67e752def86a848d6a9e4a7d20c8dd3bf4158a1288065ec1f21278a4c626e2 SHA512 6589c26dfb746aa23196ad0f5a74854ef7d7916fa48298794c9d6a146865cb124c9d1b22c922d57202de87c32487706c45d3a73c90fa9035afae6604a05de75e WHIRLPOOL 6fb36d076c891b2c2e8fa6b2af548de73a575e91037fa9b4cb4f77f74262e714f499a72a93c3d1756aabed80b336dd7bbd27a3b939eb83c76453ef52a41cbe68 AUX renpy-6.15.2-multiple-abi.patch 7631 SHA256 c75d7096b7630f72a49610a38953fe504fd6e625999b3b015d367ffc577f484d SHA512 07193f29a32ae58f94d023b054a1514c30c6d08696a650c68e40c53bf9658c895718f295cab845e1ef6681c7780d5d5f05173b7914eb8dcebbbc7cdd98f5ee2f WHIRLPOOL 22985e44e1805f6b64b31c1516bddaf2cdc6474ec418002d180155cf65e338018de7f01f6d0c62adc55e8ff766ab5d02f802c40275379af121e0259ae74b3c37 +AUX renpy-6.15.3-multiple-abi.patch 7631 SHA256 c75d7096b7630f72a49610a38953fe504fd6e625999b3b015d367ffc577f484d SHA512 07193f29a32ae58f94d023b054a1514c30c6d08696a650c68e40c53bf9658c895718f295cab845e1ef6681c7780d5d5f05173b7914eb8dcebbbc7cdd98f5ee2f WHIRLPOOL 22985e44e1805f6b64b31c1516bddaf2cdc6474ec418002d180155cf65e338018de7f01f6d0c62adc55e8ff766ab5d02f802c40275379af121e0259ae74b3c37 DIST renpy-6.14.1-source.tar.bz2 9806538 SHA256 18be3630d1956131a1f010732d15292cdcec14a2391210af27dc342fafd8197f SHA512 a1f13a5f860e66054012eab29bbd37715bd9721e2dc30fdd9c8d4d8c58dc672c35b3c813e962ad6878cb741502af5a181dff8a05f359892b6b60d2e15bc5a7bc WHIRLPOOL 54018731e136106f328bf2d028841f09424d8ffd8303821eec995c55918b2c8ac7eb97d9ed24785e95ad3d878b794f5bcf96cc9f783955f8d1ace086a3ca9b61 DIST renpy-6.15.2-source.tar.bz2 10407800 SHA256 5c828d0681dcc743a4e1dfd97f26458763f9ce878c4409ed893d6c2404de7b32 SHA512 6bce8e1c52de9e9426516d307fbe1400f52ddd650dd973bcac7c9ae0799be776d5236457fadd5ddb5615a7ee80ac8607fbff83707fe4bebac1459ae371c45ffe WHIRLPOOL d3ebb03c864a8594094d7a1c5334deab2ff083873d680b13920ea274a98e1c30df0b35b7f826487246241c3977bfca20330c4f80a7a1912d8f1a04e464b15a0e +DIST renpy-6.15.3-source.tar.bz2 10410773 SHA256 a728fd80882ec078074031e63adfcc90f1737141eeb4e88bd57f2c48401820a8 SHA512 9ba875dda9bfed8b41fe93f637a82db4cea4adb996103403dffd8fcd17ba1d2c515434ed21231a13e9b49296a23c1e502f1d2d679419e6291e38369f3e2df478 WHIRLPOOL 79cf60b5eb80061aa84cd9e5700aded029b1564b57111cac0b35619f4b6bac4c9a00b43c404c8c10b2d5c5052b46bb936c8cbcc38633f1693a85c8b9eabbc5b4 EBUILD renpy-6.14.1-r1.ebuild 2709 SHA256 2b5a99cd3715c51f3a5842cf6f356407c39769bdfec251ce8254f4b47a96bc76 SHA512 65222d83a09cbb945dfcaa3772396a12e69b3841c0ffc228cc10dea58d3a95a8d1ccb8153453d7592c3214f8d2eb04d5b09af4dcc504d441ebcceacc8efb38f5 WHIRLPOOL 29ce58c84f44d2ee97c74d5617c12e424f59539418dd6c9a02227c1debf02dc1267519c7367edbf25d053dce1a3838feb366b41db259ca4c57614526c0c678b8 EBUILD renpy-6.15.2.ebuild 2620 SHA256 7d9fa747d4321f6fe2645b227bcabb1183b816a8aaabf72ef335420622448341 SHA512 ed01499c12f536206457125a2a05159f4b7d27aa33e1827c15de48cbb324c9c7419beace229d06fc8a0672b6c7a2960d7002adea339020588cfb835548171591 WHIRLPOOL 53551982e852280c7f2e7ecd727009738f76b5d69c82bbd6c0ba4798df4e5ebb50fd8040a3899ef89f1aa2cd90d125dafa9c279c8f789b85a2f8215a4ddf3e98 -MISC ChangeLog 1417 SHA256 f8d5c8a4617ee7571892c1fd1a45e53d0453f43295f1b14602240e759024a24e SHA512 35caad9fbd593321462ea6a56028cc4f3ec0d44cd795b56dd20679227dfa79629b0dd2f9b35528f993ab011aaf10bdc113fc32d6e43731a5b829568c578c9c0f WHIRLPOOL 5b2a06a0ce84619e738c2a1b5a422857a3445aaf4aaf638f4c55d3a394efe0b0c0e85eaa3bc3bdfed431bebd752dd15c1342cfc8615f966927350a8835f1477e +EBUILD renpy-6.15.3.ebuild 2620 SHA256 b87cd9473301310f70ff83e6bf7bdfcb9f69329210af5eb97de8d870df67bf09 SHA512 9fab11998dfafbd45e493416a556a110ba7290f8b554dfdd0b7074abfaf5fe2e7f44c249721a35e22c745a80ea608c030baad330b54cd126e24d26b82293a343 WHIRLPOOL 6cceaebd7c1b427c2b95e0bb07121ecfde552d2ce9f1bb6dc1e751042f38304703a73d44d6773b23919b1ff0304e6dbc986404c45e714b52e123e684372f5322 +MISC ChangeLog 1577 SHA256 83c1b1dd34da5369a2039c73b91d06b991ecc43efa6caf84e8895e206ec6de2c SHA512 f4b31722aea005ad1c1f336d0d43498e17c5ba3c63172b72bcb384020a34c2b475e7943f5f582be9b4eceeeac40220b3a82973e07660d58736909648354589b0 WHIRLPOOL f33ccb1fe8cf88c2f3cce2dbbf84eb7aed62e10cb891fdccaf983f77887ce0f059e301dcf8ed3623125584f8288177115dd30ceaff409b75b58647250cf31c3e MISC metadata.xml 1256 SHA256 99cc618450c31ddfaa318c2b6d9b7999883910410c9443b9c198baa0672c6175 SHA512 e195f039ad2d2ab4dd268c69ef425e4493947f165b5accf9816a430618b92314f0adda7e0f000a79763b09ad817aa0d26ae35ce6a11c293eac17d781ccca15b1 WHIRLPOOL 312851bde9d65be4e3d5d35ea28b9f732d7d68c48e4ca0ac4b38d8bb154a1faca93f1524b4fa2bbd0ea3f4b62fa24db4710b50a80dcf61a8a096a5f32684fe85 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBCAAGBQJRViiSAAoJEFpvPKfnPDWz7y8H/3f3ORDyaYKtrQ0wtazfXTQZ -DfEJjtX8JhVxaLsReHF5tMB6lkma3OUTsBMmJ44PwQevu0DFRGgQZMkruCGqRxe7 -WVKo5oqqwDgMFmm1KBfUGeEmNvKA8UfZrH4uRECHUd3Q1LwxogUO8BJhyrEYba6X -oumB9ogP9fUiGo8KO3/XDPe8shotM4dqBH7ErDLWoxP3oEttmZJnx2fvt7RHEAkE -q/+yP6yTHOPXRFPNL6XCQ6+hEPHhvdQ38mNQ8n27zvjj74JetXHMBn/w7Yyzxuwe -bKVBKOwb0K5kZZ0VD2RnR1kJ32c05fRf8IxYyw61Rag66zs8eGF3ACEupZxKptg= -=5Sz+ +iQEcBAEBCAAGBQJRWYBmAAoJEFpvPKfnPDWzXDQH/3HDYDryGY0DiF/W+mbO+FBy +atSxWtjE/Kf3UctoCs2GvSz912EB/P4mFzwYYwOmGGWTelbXJoThJv+yfMcJX8N2 +HRfB4vzAJhkqExEEaygxNfmrEyo6eg8KCLMQpdJSSDfKQ746qnMv+cMs3iZn1ELi +Qjwz0patPSEt4az8nGPRNv2Blaf5D+tkgbCCOcjeUamhsWQyGAXmmjJwdyUchRDA +OyB05OnjMCkrDFmXOBAvRkYheOnG2x0WDfymmLo7wVG5ji0ic5FBh7phWALL/PaW +T+fUE3EVMi4b+0TPYLo7iBj8N4WLyyrkEhhGqa1y0KdFrbFXT3rvPLRZW/m76WQ= +=hBk9 -----END PGP SIGNATURE----- diff --git a/games-engines/renpy/files/renpy-6.15.3-multiple-abi.patch b/games-engines/renpy/files/renpy-6.15.3-multiple-abi.patch new file mode 100644 index 000000000000..acd44aa3054a --- /dev/null +++ b/games-engines/renpy/files/renpy-6.15.3-multiple-abi.patch @@ -0,0 +1,219 @@ +From: Julian Ospald +Date: Mon Feb 25 21:35:31 UTC 2013 +Subject: fix multiple abi support + +--- /dev/null ++++ renpy-6.15.2-source/renpy/common.py +@@ -0,0 +1,79 @@ ++# (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 ++ ++ 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.android: ++ return gamedir + "/saves" ++ ++ elif 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 +--- renpy-6.15.2-source/renpy.py ++++ renpy-6.15.2-source/renpy.py +@@ -25,64 +25,9 @@ + 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 +- +- 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.android: +- return gamedir + "/saves" +- +- elif 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) +@@ -97,21 +42,10 @@ + 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" +- os.environ["RENPY_GL_ENVIRON"] = "limited" +- + def main(): + +- renpy_base = path_to_renpy_base() ++ renpy_base = common.path_to_renpy_base() + + # Add paths. + if os.path.exists(renpy_base + "/module"): +@@ -134,10 +68,6 @@ + print >>sys.stderr, "correctly, preserving the directory structure." + raise + +- if android: +- renpy.linux = False +- renpy.android = True +- + renpy.bootstrap.bootstrap(renpy_base) + + if __name__ == "__main__": +--- renpy-6.15.2-source/renpy/main.py ++++ renpy-6.15.2-source/renpy/main.py +@@ -27,7 +27,7 @@ + import zipfile + import subprocess + from cPickle import loads, dumps +-import __main__ ++import renpy.common as common + + + def save_persistent(): +@@ -147,7 +147,7 @@ + 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) +@@ -206,7 +206,7 @@ + + # 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.15.3.ebuild b/games-engines/renpy/renpy-6.15.3.ebuild new file mode 100644 index 000000000000..0cf9afd966db --- /dev/null +++ b/games-engines/renpy/renpy-6.15.3.ebuild @@ -0,0 +1,111 @@ +# 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.15.3.ebuild,v 1.1 2013/04/01 12:41:09 hasufell Exp $ + +EAPI=5 +PYTHON_COMPAT=( python2_6 python2_7 ) +DISTUTILS_IN_SOURCE_BUILD=1 +inherit eutils 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.2 + dev-libs/fribidi + dev-python/pygame[X,${PYTHON_USEDEP}] + >=dev-python/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} $(pkg-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 +} -- cgit v1.2.3-65-gdbad