gentoo resync : 02.05.2018

6 files changed, 23 insertions, 23 deletions

diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz
index 2f6ed9f87872..dd88762635c7 100644
--- a/games-misc/Manifest.gz
+++ b/games-misc/Manifest.gz
diff --git a/games-misc/exult-sound/Manifest b/games-misc/exult-sound/Manifest
index 03df06c7a0b6..425896f4fe58 100644
--- a/games-misc/exult-sound/Manifest
+++ b/games-misc/exult-sound/Manifest
@@ -2,5 +2,5 @@ DIST U7MusicOGG_1of2.zip 12614413 BLAKE2B 46b4e36638510d9a13b52aad6c1423b43becd2
 DIST U7MusicOGG_2of2.zip 11382878 BLAKE2B c65f7e12b6a2a6d94cf1025c7eeb50a8ec9d81b321a66e602900f61b614899b8db654a1a59203cf4026517eaade6aeb5bd53a27085fc26ca545ae9edf01a354b SHA512 c3157faad5e02531732cd8e7ceb2a81cdb3a5b3eeaf48c73c0e753fc99c0ad438bc49f290d202f59851072aca50d22594f5c4782606d0f70d91d747cea9de924
 DIST jmsfx.zip 4778572 BLAKE2B 26ee8f735b1cb75977493a22c660bb8a9e586ca2f68918db32142d9e654c1a80aaa304756bdc72dc6ec741e699ea9f14139a267f85752cfd1017c6c6c91635bf SHA512 0822a8008ad3b9e2e6824dc6666968b8aa5f475b35dae31cf3d35d36422d68570cef440572bde07d4b4b580520b34581ab0700f7bded0bc66ae5d6020feb1662
 DIST jmsfxsi.zip 6194646 BLAKE2B 5b791132907e6579110d4e450a5c4d1362fa5a4e9021ed758be200ba11a370d44710bdd14a2b9bee0c55fcd1972e3fb732b4926d68b75404b1d5cd9fa90a2408 SHA512 1712d7d264f06d84ba38e864174d2e40a77a4270c94b2a5bccbf31dc41e187d6eeb013ebbfbc171bb6314df103a3ad5dd06daeb8ede0b5aead6cd1443680abdf
-EBUILD exult-sound-0.ebuild 893 BLAKE2B 1a3ae64f966372064917151a95c9dc2f44729f2893f6a7fd9acf4cdf86a610be1e9506835d50e7041491ecfa65f3a7b8e95e172dab427fc3cc0262c4cd388337 SHA512 1593d38bdf777c50fbef3bdd43465ad16eac3b66de9e41bb3ebe9582f8ee54567d1cb012382b4d3e7be25468b2a833a509171a23dcbf0b0d2525eceb23fbeded
+EBUILD exult-sound-0-r1.ebuild 850 BLAKE2B 4d025ade2314dbc62fc62e976f1380ee86cde4471171e4509f6f7eafbd6351dba744ae080dad25c9d5bc309f203ebaa3384d1136d46b06e55b1e6de7f08e6f9a SHA512 130b022140ac82ecfee387390b92b836e2a782585e31a4cc8ad4910001ce1f8bd0c3dee8f1e37fbd222aaa5722709dedabee966c6c9334d1a64c2d2dd2a2c143
 MISC metadata.xml 328 BLAKE2B b895ccfad252cbbeb8fe092b4416086fd43420976392111a9ee7b0f714ee22e32d64b651f7e2370466b32c840b1eb0de8702a6714b9718e6bc90fa4524b84ed0 SHA512 bf9ebdd6a99230e6cb155d0dc42b0d94aa1d15b64afc93420210b6763a46a4c8ab3f18cbc83e54068dc7c62df73baf28ee3cbc13a34c7824a724041ac13be16e
diff --git a/games-misc/exult-sound/exult-sound-0.ebuild b/games-misc/exult-sound/exult-sound-0-r1.ebuild
index da4b29d8393d..d83c7ae5d659 100644
--- a/games-misc/exult-sound/exult-sound-0.ebuild
+++ b/games-misc/exult-sound/exult-sound-0-r1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit games
+EAPI=6
 
-DESCRIPTION="sound data for games-engines/exult"
+DESCRIPTION="Sound data for games-engines/exult"
 HOMEPAGE="http://exult.sourceforge.net/"
 SRC_URI="mirror://sourceforge/exult/U7MusicOGG_1of2.zip
 	mirror://sourceforge/exult/U7MusicOGG_2of2.zip
@@ -18,7 +17,7 @@ IUSE=""
 
 DEPEND="!<games-engines/exult-9999"
 
-S=${WORKDIR}
+S="${WORKDIR}"
 
 src_unpack() {
 	mkdir music && cd music || die
@@ -29,10 +28,9 @@ src_unpack() {
 }
 
 src_install() {
-	insinto "${GAMES_DATADIR}/exult/music"
+	insinto /usr/share/exult/music
 	doins "${WORKDIR}/music/"*ogg
-	insinto "${GAMES_DATADIR}/exult/"
+	insinto /usr/share/exult/
 	doins "${WORKDIR}/flx/"*.flx
 	newdoc "${WORKDIR}/music/readme.txt" music-readme.txt
-	prepgamesdirs
 }
diff --git a/games-misc/typespeed/Manifest b/games-misc/typespeed/Manifest
index 3517c2e76e9e..9fef946670d9 100644
--- a/games-misc/typespeed/Manifest
+++ b/games-misc/typespeed/Manifest
@@ -1,4 +1,4 @@
-AUX typespeed-0.6.5-musl.patch 422 BLAKE2B 2635543607637b6499c346ce49f54f8d14ef460c46011c91d4457d59c4ca7c558b749091551f3fce7c1a1df8b5668673a2477437815f2adea621d18443a5e765 SHA512 23b264f8b5b9d7819f313d2fca1959997a14c1ac50c03643141fbeab89c20d7be0adc3c73589e26071296fedd0c42fb6f31727c8a563556a076f1e3742801643
+AUX typespeed-0.6.5-musl.patch 418 BLAKE2B c1af19bfbb0c05d3cbc0c4308ff89ecdad0825d8e77b19d32b02d8ba410538ead7c90a20f31083174cf0e0cd9a428cb4070ef76949c105c2768086ac6fbcc81e SHA512 3f5f2d1d1fd85e1829fb024bfbf355b945c04bd0a624b3e2a86dbe029f64d15473c66c7410bd4013d263fcf3142474e2ac92656699aebc0570c62d8a18a4b635
 DIST typespeed-0.6.5.tar.gz 254170 BLAKE2B ce39d5e7d31a068a34deafa1c81dc69b028339d4f8e7461e5bfce335bdc47885b224f33efc7eb02765a2ae0cc1d1b52559b210a04fa0a549d54093dbc816acc0 SHA512 cf3a8cdeb5fb1ee81bd5cf50d6b2aca1e7331b0bfde518c38050abae35ca617fbeed5bf2a37830a7568712ab71920f60c89197317a2721ae8c89829b0eede190
-EBUILD typespeed-0.6.5.ebuild 915 BLAKE2B 4bfdf6b10353b3896ba352a1c842de4e0492084d5291351c80e23ae13855d41b15fc72bc966675839517547b4068193144c5772c4df61156d9df643bb21046fe SHA512 6830f2cf6e794a5bf3446526900e3b7e9445a602138423afb2437402a6d4f5ce44541eff630d56266d05a013d448dc9498c0ce2a3427f39b5caf6652a240fbe4
+EBUILD typespeed-0.6.5-r1.ebuild 852 BLAKE2B ebc7616fb387dd6814e7707ef4a3565272cb5f0b4dec6c80625d23894f4f6b8bf01313bb3521fc867fe4e5a2e8880be605b4ff6073ac4779330fc23bf523bcfd SHA512 3a220b3ff616b6dc285128370a853c843fa195e9da6fd70cd1e57c3417e981673b2bb1418629b081fa13cb3ac697cd825aaa7e3eda3d0f5fa1807eabbdd58dd6
 MISC metadata.xml 332 BLAKE2B a7dea2ab5d54a1bf0455a41fa30f7bfb1eee06f547e2b14ce5b7d63dbf826ae43287304a331754829819addceade50bae557de63fb7d0536cf0573342ef42734 SHA512 3038edc39a8e186f2d054ff72afd3f28e62e116e436bd818080e65dc8cea1a93b5e41658c86709ca70a9df91116631b90deaefb1dc5cbe77e9f6e802e9b5af1e
diff --git a/games-misc/typespeed/files/typespeed-0.6.5-musl.patch b/games-misc/typespeed/files/typespeed-0.6.5-musl.patch
index 3fd53b328ebd..3967b10f3428 100644
--- a/games-misc/typespeed/files/typespeed-0.6.5-musl.patch
+++ b/games-misc/typespeed/files/typespeed-0.6.5-musl.patch
@@ -1,6 +1,6 @@
 diff -ur a/typespeed-0.6.5/src/typespeed.h b/typespeed-0.6.5/src/typespeed.h
---- a/typespeed-0.6.5/src/typespeed.h	2008-08-13 15:36:51.000000000 +0100
-+++ b/typespeed-0.6.5/src/typespeed.h	2016-01-01 10:41:54.919998820 +0100
+--- typespeed-0.6.5/src/typespeed.h	2008-08-13 15:36:51.000000000 +0100
++++ typespeed-0.6.5/src/typespeed.h	2016-01-01 10:41:54.919998820 +0100
 @@ -27,10 +27,10 @@
  
  #include <stdint.h>
diff --git a/games-misc/typespeed/typespeed-0.6.5.ebuild b/games-misc/typespeed/typespeed-0.6.5-r1.ebuild
index c920053621fa..354c9eba5a35 100644
--- a/games-misc/typespeed/typespeed-0.6.5.ebuild
+++ b/games-misc/typespeed/typespeed-0.6.5-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils games
+EAPI=6
+inherit autotools
 
 DESCRIPTION="Test your typing speed, and get your fingers CPS"
 HOMEPAGE="http://typespeed.sourceforge.net/"
@@ -13,32 +13,34 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc64 ~x86"
 IUSE="nls"
 
-RDEPEND="sys-libs/ncurses:0
-	nls? ( virtual/libintl )"
+RDEPEND="
+	sys-libs/ncurses:0=
+	nls? ( virtual/libintl )
+"
 DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
+	nls? ( sys-devel/gettext )
+"
 
 src_prepare() {
+	default
 	sed -i \
 		-e 's/testsuite//' \
 		-e 's/doc//' \
 		Makefile.am || die
 	sed -i -e '/^CC =/d' src/Makefile.am || die
-	epatch "${FILESDIR}"/${P}-musl.patch
+	eapply "${FILESDIR}"/${P}-musl.patch
 	rm -rf m4 #417265
 	eautoreconf
 }
 
 src_configure() {
-	egamesconf \
+	econf \
 		--localedir=/usr/share/locale \
 		--docdir=/usr/share/doc/${PF} \
-		--with-highscoredir="${GAMES_STATEDIR}" \
 		$(use_enable nls)
 }
 
 src_install() {
 	default
 	dodoc doc/README
-	prepgamesdirs
 }