gentoo resync : 14.05.2020

6 files changed, 176 insertions, 3 deletions

diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index 7361b1ea6e7a..efc52174092a 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/renpy/Manifest b/games-engines/renpy/Manifest
index 0ed3c48c4c4a..61018724cae1 100644
--- a/games-engines/renpy/Manifest
+++ b/games-engines/renpy/Manifest
@@ -2,7 +2,11 @@ AUX renpy-6.99.12.4-compat-infinite-loop.patch 1612 BLAKE2B e6c3a794e4cc94c6a493
 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-7.3.5-system-path.patch 770 BLAKE2B 61bc3e1221bf7f789fb68680656cb294e5b2617340e733fe7e15e5b2e65923bb1668d0e5fa146050fd019899966e77848e3ed3ff054229fa495ce88eea6dad96 SHA512 adf9052f64494ed498892896900f5f4e94b798ad3db42894501e2576d845332a93efee8f32fd2539c3a97f4bc674fcfea0791e1e6a9d62975c80ee4326ee29f3
+AUX renpy-7.3.5-use-system-fribidi.patch 1331 BLAKE2B 8db8947ec45c5c03abff82ee5035a7809932a265fb52d7abf1d34a42f1f0a1d7718a782bb4d9378f7321f189aaf94efe3e920b7fb64edd5995884bc5e6724caa SHA512 12abf4cffa6b031ad0400cbca38c652d9c1370b613d3aa9a5e0ec6b9f295950035fd4e474acaba2e30271f97824ead36f8b38b2d76e582066c9e1173813085ae
 AUX renpy.1 4642 BLAKE2B 446100972a1cb82dd91a25bb03895bdf717f33d1ffa27497a1e71ec561a1cb3ef986962943d890e209231b788d141a5ab86fdbefbc01a8f1c760b998e1b99a46 SHA512 2727a6ff9675a2b82a979faf5d75e7b3b96915f4c7382d22bba35d74674e613f45d4e8437e24edb410aac45cd8d219cc68e118387e538aafb32b0c312443b066
 DIST renpy-6.99.12.4-source.tar.bz2 18192453 BLAKE2B eb00db04fc6ed0aafa0428c3ba0ffe986634f8b536a7cd6c88c6082789554f6d9631f433baa3e34ab91d19509ccef5617e3fe8ec410b96f4b87d489656cc893b SHA512 375b67e15630fc21915136e70bc93db6da7c2da192d39b1256822513ae44974124522c85f1976f2af62df27b5fa11493af488b02abcf0081eeae03e1a69dfca5
-EBUILD renpy-6.99.12.4-r3.ebuild 2600 BLAKE2B c3c5a18a8c0690ab7f842a3e9d52ded8e1db1cd2901ad0356069bcb6837b614c88d3965c7a26d3f61ff772b4a5189949c72e2146c2195039d79d107904f8e43f SHA512 e5d8187c6a2c57212adfa7b24e0939facba7e53ef9308aa29cbdb3a07b1711ef2e233fb24463ef850babf01b27109b435253eb47601f874b3ad3e414a70cfeff
+DIST renpy-7.3.5-source.tar.bz2 68211972 BLAKE2B 46d8e1c788398515005eba9b668020aa2c9527e4f9207c95661d8fe86f4bbb6bc1832fc3e6808023355e2ff67666bc6d3b03f89ef58afa77d5a3abc965192175 SHA512 5a34412379682628d0be9cbbca0dfc95d5e52f8ffa871cdab0c20d028c532233b0d94a7dfdec67fec5294a789e9ca16b61dc30ef138e303d476007eaffff0d2f
+EBUILD renpy-6.99.12.4-r4.ebuild 2601 BLAKE2B 35433cab4074dd62876d1793ef6805ece5072c754e2d9d540347134c7d05861e9b63d1253e5a7107063ab184edb3fe3c9d163ce5b9676f92829f7c847e6ed4e6 SHA512 a22414e7c61487e2747d84b1cf87774898e71cbf67fb687422e8b6c968de2b74b1f5d19350b9f71b9709a31d04b34b5a063d4e232d75f8e697f9b536e3ccc52b
+EBUILD renpy-7.3.5.ebuild 2507 BLAKE2B 498510724821527fcd849069d2c2c9c2fae8a78f7763b7c17e29bb66d61fe6f48e812d67eaab40cfb9edc891cf945954c3f9e292ed5fe741751e9ed38da4905d SHA512 bbb6795786b794db20fa24616079d383d6ca6fe5d4d86c0a29d06be6ec0ad9eec550150541ee05d1f20f9d3ceee6396626cf71979bb565f4630a76598c6c3f75
 MISC metadata.xml 1063 BLAKE2B 397a9759c24976baaf19f8603b716edbaaa67c6c1ebb4fa9d971004a05d3b61a1b7fef806b7964b23c9f37c6f91dd3f22c5ae5ee007a760183ffa3cdcf5f4253 SHA512 801640d22f7d54fa918564d14aa0bfbd63c6f106dd1ff690740b93bb7da51012c42b4b75431e3741c47049121bcfb908c3a1cde6b41091b51079c5f0cacc0753
diff --git a/games-engines/renpy/files/renpy-7.3.5-system-path.patch b/games-engines/renpy/files/renpy-7.3.5-system-path.patch
new file mode 100644
index 000000000000..fc5d54aceea8
--- /dev/null
+++ b/games-engines/renpy/files/renpy-7.3.5-system-path.patch
@@ -0,0 +1,19 @@
+--- renpy-7.3.5-source/renpy.py.orig	2019-10-18 02:35:19.000000000 +0300
++++ renpy-7.3.5-source/renpy.py	2020-05-09 13:38:24.989131947 +0300
+@@ -32,6 +32,7 @@
+ import warnings
+ 
+ # Functions to be customized by distributors. ################################
++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.
+@@ -140,7 +141,7 @@
+ # 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_base = os.path.abspath(renpy_base)
+ 
+     return renpy_base
diff --git a/games-engines/renpy/files/renpy-7.3.5-use-system-fribidi.patch b/games-engines/renpy/files/renpy-7.3.5-use-system-fribidi.patch
new file mode 100644
index 000000000000..e4b0258f9844
--- /dev/null
+++ b/games-engines/renpy/files/renpy-7.3.5-use-system-fribidi.patch
@@ -0,0 +1,42 @@
+diff '--color=auto' -Naurd renpy-7.3.5-source.orig/module/renpybidicore.c renpy-7.3.5-source/module/renpybidicore.c
+--- renpy-7.3.5-source.orig/module/renpybidicore.c	2018-10-12 08:37:06.000000000 +0300
++++ renpy-7.3.5-source/module/renpybidicore.c	2020-05-09 12:46:30.811881811 +0300
+@@ -1,5 +1,5 @@
+ #include <Python.h>
+-#include <fribidi-src/lib/fribidi.h>
++#include <fribidi.h>
+ #include <stdlib.h>
+ 
+ #ifndef alloca
+--- renpy-7.3.5-source.orig/module/setup.py	2019-08-09 05:11:58.000000000 +0300
++++ renpy-7.3.5-source/module/setup.py	2020-05-09 12:46:46.463942266 +0300
+@@ -119,28 +119,13 @@
+     sdl + [ png, 'z', 'm' ])
+ 
+ FRIBIDI_SOURCES = """
+-fribidi-src/lib/fribidi.c
+-fribidi-src/lib/fribidi-arabic.c
+-fribidi-src/lib/fribidi-bidi.c
+-fribidi-src/lib/fribidi-bidi-types.c
+-fribidi-src/lib/fribidi-deprecated.c
+-fribidi-src/lib/fribidi-joining.c
+-fribidi-src/lib/fribidi-joining-types.c
+-fribidi-src/lib/fribidi-mem.c
+-fribidi-src/lib/fribidi-mirroring.c
+-fribidi-src/lib/fribidi-run.c
+-fribidi-src/lib/fribidi-shape.c
+ renpybidicore.c
+ """.split()
+ cython(
+     "_renpybidi",
+     FRIBIDI_SOURCES,
+-    includes=[
+-        BASE + "/fribidi-src/",
+-        BASE + "/fribidi-src/lib/",
+-        ],
++    libs=["fribidi"],
+     define_macros=[
+-        ("FRIBIDI_ENTRY", ""),
+         ("HAVE_CONFIG_H", "1"),
+         ])
+ 
diff --git a/games-engines/renpy/renpy-6.99.12.4-r3.ebuild b/games-engines/renpy/renpy-6.99.12.4-r4.ebuild
index c330a8ab54ba..f0c471b474a3 100644
--- a/games-engines/renpy/renpy-6.99.12.4-r3.ebuild
+++ b/games-engines/renpy/renpy-6.99.12.4-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,7 +27,7 @@ RDEPEND="
 	media-libs/libsdl2[video]
 	media-libs/freetype:2
 	sys-libs/zlib
-	virtual/ffmpeg"
+	media-video/ffmpeg"
 DEPEND="${RDEPEND}
 	dev-python/cython[${PYTHON_USEDEP}]
 	virtual/pkgconfig"
diff --git a/games-engines/renpy/renpy-7.3.5.ebuild b/games-engines/renpy/renpy-7.3.5.ebuild
new file mode 100644
index 000000000000..f408ea63475c
--- /dev/null
+++ b/games-engines/renpy/renpy-7.3.5.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_IN_SOURCE_BUILD=1
+DISTUTILS_USE_SETUPTOOLS=no
+inherit gnome2-utils 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=0
+KEYWORDS="~amd64 ~x86"
+IUSE="development doc examples"
+REQUIRED_USE="examples? ( development )"
+
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	virtual/pkgconfig"
+DEPEND="
+	dev-libs/fribidi
+	~dev-python/pygame_sdl2-${PV}[${PYTHON_USEDEP}]
+	>=dev-lang/python-exec-0.3[${PYTHON_USEDEP}]
+	media-libs/glew:0
+	media-libs/libpng:0
+	media-libs/libsdl2[video]
+	media-libs/freetype:2
+	sys-libs/zlib
+	media-video/ffmpeg"
+RDEPEND="${DEPEND}
+	!app-eselect/eselect-renpy"
+
+S=${WORKDIR}/${P}-source
+
+PATCHES=(
+	"${FILESDIR}"/${P}-system-path.patch
+	"${FILESDIR}"/${PN}-6.99.12.4-compat-style.patch
+	"${FILESDIR}"/${PN}-6.99.12.4-compat-infinite-loop.patch
+	"${FILESDIR}"/${P}-use-system-fribidi.patch
+)
+
+python_prepare_all() {
+	einfo "Deleting precompiled python files"
+	find . -name '*.py[co]' -print -delete || die
+	rm -r module/{gen,fribidi-src} || die
+
+	export CFLAGS="${CFLAGS} $($(tc-getPKG_CONFIG) --cflags fribidi)"
+	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
+
+	cd "${S}" || die
+	python_newscript renpy.py ${PN}
+
+	python_domodule renpy
+	if use development ; then
+		python_domodule launcher
+	fi
+	if use examples ; then
+		python_domodule the_question tutorial
+	fi
+}
+
+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} "Ren'Py ${PV}" ${P}
+	fi
+
+	if use doc; then
+		insinto "/usr/share/doc/${PF}/html"
+		doins -r doc/*
+	fi
+	newman "${FILESDIR}/${PN}.1" "${P}.1"
+}
+
+pkg_preinst() {
+	use development && gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	use development && gnome2_icon_cache_update
+
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		ver_test "${v}" -ge 7 && continue
+		einfo "Starting from ${PN}-7 slots are dropped."
+		einfo "RenPy natively supports compatibility with games made for older versions."
+		einfo "Report bugs upstream on such problems, usually they are easy to fix."
+		break
+	done
+}
+
+pkg_postrm() {
+	use development && gnome2_icon_cache_update
+}