gentoo resync : 05.04.2018

7 files changed, 66 insertions, 10 deletions

diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index 1a97c22cf337..59b1534e54af 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/renpy/Manifest b/games-engines/renpy/Manifest
index 52d703b6fade..3905a2a207f6 100644
--- a/games-engines/renpy/Manifest
+++ b/games-engines/renpy/Manifest
@@ -6,6 +6,6 @@ AUX renpy-6.99.12.4-multiple-abi.patch 11945 BLAKE2B 97b4d69a820c5147a64cedd3a67
 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 2521 BLAKE2B e300c68e5d22877bb37f90e4a8aecf51d2450d6ba858a8805659a3197d72fc39d2d42d27fff0639eb36c8e25728999e684ec59655bda062f6b9444b736ed7ff4 SHA512 8dcee437ea8a1b9853d90d1c559988e0ea4206f5dbf2fb70e77231c2ba18999ff64f51ce0bf16dd4404bb20465a9fa266bb2855bdfe3db6ccb628a422791993c
-EBUILD renpy-6.99.12.4-r3.ebuild 2598 BLAKE2B 3f92493895ecf21b6f7839229b6647e2426bc20567c44f19b996e9203b2c0fde321db83f7fc457a41dce5dc0be82d59700dfcf3d7c1cac520c24f80e1a2d8cb4 SHA512 afe651513c3064949af87eec4135574a950eaf7928bd93b8edbccb88cd4a14e45205f061ebd30f8ca37c90625ad31ca3712b46c415d436e7df6a251c5554bb93
+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/renpy-6.17.7.ebuild b/games-engines/renpy/renpy-6.17.7.ebuild
index adc56df50743..07642c3817c7 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-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,8 +7,8 @@ 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="http://www.renpy.org"
-SRC_URI="http://www.renpy.org/dl/${PV}/${P}-source.tar.bz2"
+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)"
diff --git a/games-engines/renpy/renpy-6.99.12.4-r3.ebuild b/games-engines/renpy/renpy-6.99.12.4-r3.ebuild
index 27a1a8b3f14e..c330a8ab54ba 100644
--- a/games-engines/renpy/renpy-6.99.12.4-r3.ebuild
+++ b/games-engines/renpy/renpy-6.99.12.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,8 +7,8 @@ DISTUTILS_IN_SOURCE_BUILD=1
 inherit eutils gnome2-utils toolchain-funcs versionator 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"
+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)"
diff --git a/games-engines/zoom/Manifest b/games-engines/zoom/Manifest
index 72ee3c4c835b..cc0855d81c81 100644
--- a/games-engines/zoom/Manifest
+++ b/games-engines/zoom/Manifest
@@ -1,3 +1,4 @@
+AUX zoom-1.1.5-gcc7.patch 1732 BLAKE2B 3e7ce92fc7804dabdcd37db32f8dbbdccd4716b52d5266507df01cec35db40b0cafd753c32c4fb7b341c7ee784d752968f99cf06a20d067055c796b175ac5cca SHA512 8b8e130cf889efa48c737145044b23a858419d03ffc7af90fdd875e54a6e3b2f5df148d7755cd325b798445d2190db38ee193a135cae46867a3be7971e346f49
 DIST zoom-1.1.5.tar.gz 2185098 BLAKE2B 899ee9afef431d2cf5a36cbb8c8c5452b8a5a24ce705ed6a5cdba5a6331e4a86fe819a9309748d1f8b7faf9e1d3267a86bc65ded8a52d17d9d2a4cdd6ab600a2 SHA512 800b29e3517ce39000d8c05148d6af0d7c8666db20a06867e35076ffa1914b845e8fa0153571975e59842672572b80826ee8dbe3b2d4bc98c07394054e9bd7ca
-EBUILD zoom-1.1.5-r1.ebuild 562 BLAKE2B 1c38e45b633bb57d72f22a1fa76859b217626e1b9c2492c0425c776e46685328b38a6366d1a3d71c539b24574813c8cdcdd4919d911fd4990af0a8e6ecabeade SHA512 f9a3fc57597ad1eaf4095a53a39af1e8d71346c6e49441766829283f70c0583fb32bbfde0f5ecb63793ce41b463d2d1ce3fb1b8896097dd75c0032fc32e28b32
+EBUILD zoom-1.1.5-r1.ebuild 605 BLAKE2B a7dea11ed292eef18f85691d38863db7ec0f2c83f4325be25e3cab1a5d42fe8271985a50b012f12c2885c0b2accff51a56fc05a0d2c4ed1531866a350e8b59cc SHA512 b7390e2603bb3cd448de3ebfe3cf94ba1d245632b9e1a3d9fd86c8c41138c8182b1bd04a6d3c6ca5838aa6da2cde42fc0e3aec7ab22824470353a6e16153e79b
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-engines/zoom/files/zoom-1.1.5-gcc7.patch b/games-engines/zoom/files/zoom-1.1.5-gcc7.patch
new file mode 100644
index 000000000000..6f50d3f43624
--- /dev/null
+++ b/games-engines/zoom/files/zoom-1.1.5-gcc7.patch
@@ -0,0 +1,53 @@
+Bug: https://bugs.gentoo.org/617808
+Upstream commit: https://github.com/Logicalshift/zoom/commit/6b0ad57dd2c125c9126e9b7913560ad25709a36f
+
+From 6b0ad57dd2c125c9126e9b7913560ad25709a36f Mon Sep 17 00:00:00 2001
+From: Andrew Hunter <andrew@logicalshift.co.uk>
+Date: Sat, 3 Mar 2012 16:31:35 +0000
+Subject: [PATCH] Inline functions need to be marked as static in order to
+ compile with LLVM
+
+---
+ src/interp.c   | 4 ++--
+ src/tokenise.c | 6 +++---
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/interp.c b/src/interp.c
+index a5fa8fe..3d446fa 100644
+--- a/src/interp.c
++++ b/src/interp.c
+@@ -232,7 +232,7 @@ ZFrame* call_routine(ZDWord* pc, ZStack* stack, ZDWord start)
+   return newframe;
+ }
+ 
+-inline void store(ZStack* stack, int var, ZWord value)
++static inline void store(ZStack* stack, int var, ZWord value)
+ {
+ #ifdef DEBUG
+   printf_debug("Storing %i in Variable #%x\n", value, var);
+@@ -253,7 +253,7 @@ inline void store(ZStack* stack, int var, ZWord value)
+     }
+ }
+ 
+-inline void store_nopush(ZStack* stack, int var, ZWord value)
++static inline void store_nopush(ZStack* stack, int var, ZWord value)
+ {
+ #ifdef DEBUG
+     printf_debug("Storing %i in Variable #%x\n", value, var);
+diff --git a/src/tokenise.c b/src/tokenise.c
+index 5925169..fb442d0 100644
+--- a/src/tokenise.c
++++ b/src/tokenise.c
+@@ -154,9 +154,9 @@ ZDictionary* dictionary_cache(const ZUWord dict_pos)
+ 
+ int cache = 1;
+ 
+-inline ZUWord lookup_word(unsigned int*  word,
+-			  int            wordlen,
+-			  ZUWord         dct)
++static inline ZUWord lookup_word(unsigned int*  word,
++                                 int            wordlen,
++                                 ZUWord         dct)
+ {
+   ZByte packed[12];
+   int zscii_len;
diff --git a/games-engines/zoom/zoom-1.1.5-r1.ebuild b/games-engines/zoom/zoom-1.1.5-r1.ebuild
index 20d982f0281d..1f5085ae61da 100644
--- a/games-engines/zoom/zoom-1.1.5-r1.ebuild
+++ b/games-engines/zoom/zoom-1.1.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,6 +22,8 @@ DEPEND="${RDEPEND}
 	dev-lang/perl
 	x11-proto/xextproto"
 
+PATCHES=( "${FILESDIR}"/${P}-gcc7.patch )
+
 src_install() {
 	default
 	dodoc -r manual/*