version bump

Package-Manager: portage-2.2.0_alpha164/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

4 files changed, 345 insertions, 9 deletions

diff --git a/games-engines/renpy/ChangeLog b/games-engines/renpy/ChangeLog
index 6ea1c2ec9d9e..435d0646b987 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.3 2013/02/27 21:51:34 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/renpy/ChangeLog,v 1.4 2013/03/04 16:02:13 hasufell Exp $
+
+*renpy-6.15.0 (04 Mar 2013)
+
+  04 Mar 2013; Julian Ospald <hasufell@gentoo.org> +renpy-6.15.0.ebuild,
+  +files/renpy-6.15.0-multiple-abi.patch:
+  version bump
 
   27 Feb 2013; Julian Ospald <hasufell@gentoo.org> metadata.xml:
   add proxy-maintainer
diff --git a/games-engines/renpy/Manifest b/games-engines/renpy/Manifest
index 26b7b1adc026..77785b219251 100644
--- a/games-engines/renpy/Manifest
+++ b/games-engines/renpy/Manifest
@@ -4,18 +4,21 @@ Hash: SHA256
 AUX renpy-6.14.1-av_close_input_stream.patch 291 SHA256 da5d69dadb0c8559f20b205999580fa7b4bc9647c5eb5b3567dc198745b006ba SHA512 6c6dd700e8b11397089791179db4eea2da403671470b4500d0baa37d712be1e73676d4ac9997d869de19fe11b4625edcca91c074ad64e99ea463e630d4995991 WHIRLPOOL f937817ab4c21bdce3137b10f8d1b60900b76644c1cd0b02c11009fec4dd309d5fc3834d9dfa58475eab584de85bec931b7e57707d2b1dbd400cc8cb8cf3e420
 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.0-multiple-abi.patch 7631 SHA256 b9e9ad57fa365cdbb9200ceccf60ca11391c8ca9a0a954283ae1f2f95d35b27f SHA512 f6f85d4130e0015915a86a5a23b15eb41b6df6f9203d6fef8f3c5455abbc1d4a1a93f8fb211bbdfb911ffc9ed0e48c1ee0033e7fc93855b82cd0594ef1552ef9 WHIRLPOOL 1ddbd074d992e08fbc5cc8dea7345bb00383195898d0bf5c731b4cec051f254e5b96ef103b94803f0acd377e9d5382769221e461ff04775adcdc26e64a39db23
 DIST renpy-6.14.1-source.tar.bz2 9806538 SHA256 18be3630d1956131a1f010732d15292cdcec14a2391210af27dc342fafd8197f SHA512 a1f13a5f860e66054012eab29bbd37715bd9721e2dc30fdd9c8d4d8c58dc672c35b3c813e962ad6878cb741502af5a181dff8a05f359892b6b60d2e15bc5a7bc WHIRLPOOL 54018731e136106f328bf2d028841f09424d8ffd8303821eec995c55918b2c8ac7eb97d9ed24785e95ad3d878b794f5bcf96cc9f783955f8d1ace086a3ca9b61
+DIST renpy-6.15.0-source.tar.bz2 10409275 SHA256 aa278691f1ebd54477f154c408b59271fdbc445b6a51b6f4a1e985cd8664a479 SHA512 8ad2299a61d0e2e2c0c08d441459b28a09a3244dfcf173957e3bbbf2d9eb64087c12c05e62438dca815116d9582a136c50d5cceb33796146adc4d9508ac630b1 WHIRLPOOL 8a4cda0a5c389f5dad20d8f6bab373ad9a751df80e65a154d073be9b6d2b100ce35454fb16fc2d2a488c1e76544cb7df0f27fb8a18045e8922d5e0bb1fd12a67
 EBUILD renpy-6.14.1-r1.ebuild 2625 SHA256 a74095ad92d987e65bd51835ba1b4ee64ab61eb15b275e3ebdba14e89c0a1c30 SHA512 95916911b0c1b0225002897e139166101947183fc7479e8400dc55ce56b762dee7228b5321d9b348d32359a096d730cc55286ec02090697dfe3b82fa99c7bc8b WHIRLPOOL 784739f0f7b74bc4b3779009db000f5cd498cbf2590b34be48b609ac353f5cfa2f37f99148d79de8fe4c1fde420ab6768c107a816e13ef3062955ab6d4b38249
-MISC ChangeLog 795 SHA256 d43a242b8ebdae143e6d36a128bac613b41481cdf8c8a9cd1ae5b3e0203788f4 SHA512 e562f31760ee83f510069aa3106660fe37744ea032e13f665654a2df93f035125badf6a5b879062efa073e04ad21315845a7040a6c53e5fb8b2b244308c1f856 WHIRLPOOL a65cda567a037688be25e895f2f8574de3f0d945416534509e84138993de10d02db74ebf6cb8850f5e85943bc89fbf1ff99b72087ad83c029bcbd69fc3e8d506
+EBUILD renpy-6.15.0.ebuild 2536 SHA256 7d0d8487f753aa20f275058757793998997462e62f331ac2c080181dd29af6cb SHA512 5aa29b5a6ac609c1a1d8e8636e9203d0243202d58a4d11d2e37d227d9eb4b9d62f5b363ef682de67494a53376985a8babf158eccb9b72585ecbffb127a5e300a WHIRLPOOL 3ee4c47a2f7056a582563ac970fec503d5faee255bf9fec66f5555de28ec14b2fe6957d839af1948ffe913ec5c374d5999b6813811ed0aa06e6b7a0f78571385
+MISC ChangeLog 955 SHA256 a7dddda8e87728db7a1721eeca15cab4b756822a78cc3d1f2b8cd76ff30a213e SHA512 e151527a3b28ebf6ad442ad798aa740d6ecc1f17dd7abba65d51bbf2487bd70ec560174295798f2f4f2884da7a1facf5b3ed06b839383816c1b1e3c1441f77fc WHIRLPOOL 14b37b83fa2407c729f60d2d290e944547daec0af3d070c47a63b2852f522cd135f6f593887dc148e8bba79868b1754f436e9cbd95eda8f5e60b8568d291bf2d
 MISC metadata.xml 1224 SHA256 bd89ab35589f4256e2ddb50ba4ccec949081549c23d6a82c7f16761a66fda525 SHA512 add18beced8253f7f0b99a321e86c772a77f386a20b8e0c007eeda4594a077988b8c52521232db707290f07771bcd0ca768cb93ed211291569346d7b9f7be758 WHIRLPOOL 0a31bffa4ebcd52605b33cb45e50fce303f29b1463576c74463ad5807c263c6090c06732641e57ec07ab883761650f3cb3ea6983a870acbcb818987acebcfe95
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRLn/pAAoJEFpvPKfnPDWzilkIAJuWLSoP5VMq/By3yn7gHonv
-63RA+jahneVNboQq0JLkwkYV7rZhM4kzauwK+xF9HJCA8NB4cqzyPseNjxtpEqdw
-s9LB2EDGL+vzMJLV5K4HRFsSlRTM9llv8MdcSoGgNRQK9Y7O0lZxkbuiQerxEkei
-wR2QJSMbdYyMtwNnAvesSDgHtLPillYsdi0XC931HxLONvrrQiCx8EM4hpnP0x//
-2Xm3k+iP2Pe5WET5xV5+zGgJn9pj4ukWo18DuI8qyJSpJtjobO9ri8wIazWp1KJa
-pZi9Q6ehpptbSYSS48HyiWlEA+WGFoZCHuXSSZB7MO+E38UZHcJmSIyW0HMCwuY=
-=gp7N
+iQEcBAEBCAAGBQJRNMWFAAoJEFpvPKfnPDWz6ZEH/A/L4LpCrx884B6SWahaJsGo
+iyyXrqUKCK3In87YrSKyry6UC5wpDQ3N+18r+42CibpydMVFfNKHMlEfODI1NbE+
+J8zb3cHUegV6eJlKFSZdgdJKYUbFvAUK7GkY3AmQqTfcEmeNdrOzY2gSzbWmae//
+cDGxdEsVdaps22yCHrnOUNi/cKwaHvykiry7MZetQFIiT8W/SRreTmc47V8m7y6y
+iExmeNY2L0RdVmBnt9pbJt6NjkpDdLM7sg1JG0xeflBpBgyBtu1Y+u1zyiQK6T3P
+/gWleCGvUp1zkcOD/sjq1fAHJZKNt1uVOve8OIo6JUdcx7i/DI/A7/rVXU5RzdE=
+=TWc8
 -----END PGP SIGNATURE-----
diff --git a/games-engines/renpy/files/renpy-6.15.0-multiple-abi.patch b/games-engines/renpy/files/renpy-6.15.0-multiple-abi.patch
new file mode 100644
index 000000000000..1aa34b29ff1a
--- /dev/null
+++ b/games-engines/renpy/files/renpy-6.15.0-multiple-abi.patch
@@ -0,0 +1,219 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Mon Feb 25 21:35:31 UTC 2013
+Subject: fix multiple abi support
+
+--- /dev/null
++++ renpy-6.15.0-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.0-source/renpy.py
++++ renpy-6.15.0-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.0-source/renpy/main.py
++++ renpy-6.15.0-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.0.ebuild b/games-engines/renpy/renpy-6.15.0.ebuild
new file mode 100644
index 000000000000..3357c6b3f452
--- /dev/null
+++ b/games-engines/renpy/renpy-6.15.0.ebuild
@@ -0,0 +1,108 @@
+# 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.0.ebuild,v 1.1 2013/03/04 16:02:13 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
+
+	einfo "running: eselect renpy update --if-unset"
+	eselect renpy update --if-unset
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	use development && gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	use development && gnome2_icon_cache_update
+}