gentoo resync : 16.04.2018

7 files changed, 17 insertions, 15 deletions

diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz
index 84416c88529b..f1006aa36600 100644
--- a/games-misc/Manifest.gz
+++ b/games-misc/Manifest.gz
diff --git a/games-misc/fortune-mod-norbert-tretkowski/Manifest b/games-misc/fortune-mod-norbert-tretkowski/Manifest
index c4ffdb955d32..648b3ad3f33d 100644
--- a/games-misc/fortune-mod-norbert-tretkowski/Manifest
+++ b/games-misc/fortune-mod-norbert-tretkowski/Manifest
@@ -1,3 +1,3 @@
 DIST fortune-mod-norbert.tretkowski-20030120.tar.gz 11501 BLAKE2B 4d5662d1dff0795dace05e1ae2780e6c4b76233eef69febf3770b0fb91cbdd307d5a38930e7ab1711db2d4059b26f6029966bf63e828de3c4496396889bf157d SHA512 df4b846581d6dea55226d6e58235a288def209536f43766fa8b56a07e3a5affbb68e8138e2e01711878480550df322ed6999ef35a41330a58a2f516abc5db13e
-EBUILD fortune-mod-norbert-tretkowski-20030120.ebuild 640 BLAKE2B f4f19cb9a4a75a9c0a1c8e1aeeaea8b2af4dcdf500f0d114d563eb56cbad1ffde995050e1f99e637bc2c41b6e7d83b085d3b8167799ad07b5649d3e549970bfd SHA512 cee3b53dc644ef531007882bd73c2d0fc67c799dd14ec7607879af1ac22a8db6928156c4050811694663b89eb86e34b2953c60a5eaea0635a83b82062559f6f0
+EBUILD fortune-mod-norbert-tretkowski-20030120.ebuild 647 BLAKE2B 3c2896b0bbdc8d4a6e10a3f7b05c25375d56c77568d1b4c3c41ffb9e81cdc82b84de8fe6c37ef22a588352e6693da70e14a2876dfbf9fa1c8594d389d6a77fbf SHA512 5a1cd2a929126608634a198a56ac844d6b8036dfddf0207ad6086a5a1dd97314854adf376384d908c75c8433414cda3ad2467511e285300fb50e26dcf7b3bfc3
 MISC metadata.xml 338 BLAKE2B a447f8b77fda70cb6cd7c8b1ccc2265317607a851a134dcdd4a1718c338ced40e91935ad337228890f10df94cab00ac484257b585762b735f8463ef8707b6ece SHA512 eafdde3a9e9cc33fd4dba816289aaf3dd0527f139ddc5cf76eddc13736d7f32277ceb23d86762d7ae8167f05942eb985756da89576dd87be69c7642469d2aa3f
diff --git a/games-misc/fortune-mod-norbert-tretkowski/fortune-mod-norbert-tretkowski-20030120.ebuild b/games-misc/fortune-mod-norbert-tretkowski/fortune-mod-norbert-tretkowski-20030120.ebuild
index 0fcdf24ed760..c6d784c5450f 100644
--- a/games-misc/fortune-mod-norbert-tretkowski/fortune-mod-norbert-tretkowski-20030120.ebuild
+++ b/games-misc/fortune-mod-norbert-tretkowski/fortune-mod-norbert-tretkowski-20030120.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
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/fortune-mod-fvl/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-thomas-ogrisegg/Manifest b/games-misc/fortune-mod-thomas-ogrisegg/Manifest
index 74a954dedef6..b5e427dc751b 100644
--- a/games-misc/fortune-mod-thomas-ogrisegg/Manifest
+++ b/games-misc/fortune-mod-thomas-ogrisegg/Manifest
@@ -1,3 +1,3 @@
 DIST fortune-mod-thomas.ogrisegg-20030120.tar.gz 15662 BLAKE2B 58c2bbc1b7c432fad02b201d277eb5608151756efce4126eb20f62f30397bb74577d3dacafab3c5abfa136a61d2ac1d596fd20daf7dc7117eeabd29259244f82 SHA512 e1888b117074ae44eeb34ba499f03793d33cbcf5c2af20eec4171078485d37c06a3ccbcb80a620ea4a8e564840fe832d310ddaa8bc5a5164c8d2f870db0791b0
-EBUILD fortune-mod-thomas-ogrisegg-20030120.ebuild 628 BLAKE2B 5ad15aa534b50f07c63a1014d72a8e542c78d43e667f1b30dbd18eea275688f88330b7a752ebd0448a4afc550786768d5312ee2731baa6d17d0bf8ed46fb2129 SHA512 65ebe6c9382d103ca71812cb325e68ac5b7d4439bbac63b122411d251ae35922356cf47029db65a7221b6e64f853aa90492abd6e5393efa6f93791543d01dde0
+EBUILD fortune-mod-thomas-ogrisegg-20030120.ebuild 635 BLAKE2B e59bf3fca272bbf1d7d8ad988703ddb89a288937a50f248982c07382ba1150dc4317f31b6146c16c19128593f38284cebcf6ae14ece2f5a87fb8844e8d1fb62b SHA512 15486d4352b51f51bb5dad7f152b929f4fe7329670bc2a99f6a71d787ea3a336a330756634030626914005a3164ca96806d7318624a344cf15a80a83a6ec9507
 MISC metadata.xml 338 BLAKE2B a447f8b77fda70cb6cd7c8b1ccc2265317607a851a134dcdd4a1718c338ced40e91935ad337228890f10df94cab00ac484257b585762b735f8463ef8707b6ece SHA512 eafdde3a9e9cc33fd4dba816289aaf3dd0527f139ddc5cf76eddc13736d7f32277ceb23d86762d7ae8167f05942eb985756da89576dd87be69c7642469d2aa3f
diff --git a/games-misc/fortune-mod-thomas-ogrisegg/fortune-mod-thomas-ogrisegg-20030120.ebuild b/games-misc/fortune-mod-thomas-ogrisegg/fortune-mod-thomas-ogrisegg-20030120.ebuild
index 2db4965bb1d5..dfd7b0a14886 100644
--- a/games-misc/fortune-mod-thomas-ogrisegg/fortune-mod-thomas-ogrisegg-20030120.ebuild
+++ b/games-misc/fortune-mod-thomas-ogrisegg/fortune-mod-thomas-ogrisegg-20030120.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/fortune-mod-fvl/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/katawa-shoujo/Manifest b/games-misc/katawa-shoujo/Manifest
index 4ce4a9198ed2..96cee4696584 100644
--- a/games-misc/katawa-shoujo/Manifest
+++ b/games-misc/katawa-shoujo/Manifest
@@ -1,5 +1,5 @@
 DIST katawa-shoujo-1.3.1.tar.bz2 496188604 BLAKE2B a27fbc84ac0594790ad5b77e6c7e49c19c2b4716b1e5e516171b593211f1d5f2ca1bddc3e0ebb92420b7529b4b2fdff7b0732bb61b5aa2acdaf45e33dd713497 SHA512 d5f1b49c60b70b272dd5d62c1d49cb9e3c17e3f77339fc593db2122f1c140005bc23ecb7ad9b0d93c0701c77f9bcfcd5c1c67db1cbe3034a3be42a4309387809
 DIST katawa-shoujo-256.png 59803 BLAKE2B 2acf08b55ae3e776ac260b552fd6a04b17a3246534702fbf39bdfcd49348778c1703d0ad135bca7933a82de3d983b9c19c255ed72006b7ca2c73acc157f6e9cb SHA512 7d920c24f4182ba72d5b3d641d7d373c166ca4c7d0b6a396f5e3b9281cb43f7e6e8e761f2f181ff061705118b3080807866fcd290d2b471e98c3a584d5fa8e0e
 DIST katawa-shoujo-48.png 3621 BLAKE2B 1f9ad61bcbd90218d6b11269e7c93a5b2816eee0640f191027e656978dc968a673a3ff02deee0d960a188c2893dde95a45134a847c58c627e1fd7ff2e5b28da1 SHA512 ad24156cf446ffe92068baaa6d512e6bab90587db5ce01b3c18e6c42bb9b8c91f7eae3e9547099d3f8f0a5d3f144676c3499c0a38d9af845abf79e153b543bef
-EBUILD katawa-shoujo-1.3.1.ebuild 2048 BLAKE2B b3f5372e32d343924010003815823a44868533d9f63ba0afa314e10d3a14df676850acc53134e49807985f0ea8db41d866a8b188b27fab5ab198fa32b57096ce SHA512 1ec46aaa73baa5779b4348d9eed48128b8d3b17f6eaf8b186f9e9016ab9d1a3838a3c4dc9a318c8c0092ed78e51ead48472dbb3f8a18eaa4ace81ee0cab55efc
+EBUILD katawa-shoujo-1.3.1-r1.ebuild 2065 BLAKE2B c5d023478c5b3af91e0b99e91c5f55fc50f44d705ebebc513ba1737b8b587f8b6ca5475b22a0f38a4deeacf2b13cc333adcc117dc694fac9eb409673c2638ba4 SHA512 aa9014429e14f018b2239cdb0413ea4da484f5ebc8b4dbc6060da415b897ee1bf1612691bf7cc85d440352d4498e15785865dd2bd4f7ce542b915c13a567123e
 MISC metadata.xml 1219 BLAKE2B 6e95455f55b87eef6d4d079ff28a6d29f336db425386a81d9067c02ae9b2bc6be5168be0999cfe6a9572be5d1560eb918db37d5dca4e537746133ff8be3f1574 SHA512 3482903b61840dabd8e30941699c2e1319f7d0a384bded5bead56def041b6592e69a0a3a9210c361c875082362dbe3c6c80356e0e12cbe7ecff3ea4eabc8ea30
diff --git a/games-misc/katawa-shoujo/katawa-shoujo-1.3.1.ebuild b/games-misc/katawa-shoujo/katawa-shoujo-1.3.1-r1.ebuild
index 14ba5a9ef213..6c9ac1da5789 100644
--- a/games-misc/katawa-shoujo/katawa-shoujo-1.3.1.ebuild
+++ b/games-misc/katawa-shoujo/katawa-shoujo-1.3.1-r1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
+EAPI=6
 inherit eutils gnome2-utils
 
 DESCRIPTION="Bishoujo-style visual novel by Four Leaf Studios"
@@ -12,16 +11,20 @@ SRC_URI="http://dl.katawa-shoujo.com/gold_1.3.1/%5B4ls%5D_katawa_shoujo_1.3.1-%5
 	https://dev.gentoo.org/~hasufell/distfiles/katawa-shoujo-256.png"
 
 # bundled renpy includes licenses of all libraries
-LICENSE="CC-BY-NC-ND-3.0
-	!system-renpy? ( MIT PSF-2 LGPL-2.1 || ( FTL GPL-2+ ) IJG libpng ZLIB BZIP2 )"
+LICENSE="
+	CC-BY-NC-ND-3.0
+	!system-renpy? ( MIT PSF-2 LGPL-2.1 || ( FTL GPL-2+ ) IJG libpng ZLIB BZIP2 )
+"
+
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc +system-renpy"
-
-RDEPEND="system-renpy? ( games-engines/renpy )"
 
+IUSE="doc +system-renpy"
 REQUIRED_USE="!system-renpy? ( || ( amd64 x86 ) )"
 
+RDEPEND="system-renpy? ( games-engines/renpy:6.99 )"
+DEPEND=""
+
 # Binaries are built extremely weirdly, resulting in errors like:
 # BFD: Not enough room for program headers, try linking with -N
 #
@@ -37,7 +40,6 @@ src_install() {
 	if use system-renpy; then
 		insinto "/usr/share/${PN}"
 		doins -r game/.
-
 		make_wrapper ${PN} "renpy '/usr/share/${PN}'"
 	else
 		insinto "/opt/${PN}"