gentoo resync : 16.04.2018

4 files changed, 18 insertions, 17 deletions

diff --git a/games-arcade/conveysdl/Manifest b/games-arcade/conveysdl/Manifest
index 5fdc7925af63..457772c0e250 100644
--- a/games-arcade/conveysdl/Manifest
+++ b/games-arcade/conveysdl/Manifest
@@ -1,5 +1,5 @@
-AUX conveysdl-1.3-arrays.patch 993 BLAKE2B 14f3ce7f38aa10222c2a220ecc5e9a2764f39c4adf3017311af8386f46d9fff8b6fd23815ac2af36d14ca3481115f27dc8ca97ded7899317d59516e29e1f147b SHA512 d8e6c0506e6108ccde4019dc45f3e28a431f8b617de9c81cf1fa46c14a66050271369952d7694dd7b1e3258c1f18c65dfa2b5f644ffcae1b21739d6287740640
-AUX conveysdl-1.3-speed.patch 1410 BLAKE2B 74a33eb986118110874349fa7e9429560bbb91cb253be10e76a56333e9614b336afc0ebc2ef9abebd72347b473a688e4b267a14afba4e69c16ce53a2801a8f3e SHA512 491dac8d64bab8937f16651700af32b3d6bf18b947cc353245223ed82c19fca5ccb8c778b0d65364ae27be1cf9331545f938467c03568672e98c0a9e2b514b1c
+AUX conveysdl-1.3-arrays.patch 997 BLAKE2B 6a243b48ee809c86a02a6c49117a0e86a1b0dbce80cb9c761e693b66a576536b92ffb1c61e0bb3676d2b6850f1b8985d52d0c0d67de4bf9e6aaf186fed2e1bac SHA512 c4d52d0da7bedb4941d7438203e7c1d25d72960ab739e1a4c359628424a95f95001340b74b7926ae22c7c837f2f7a241891381f16c3a15f75e51ad908cc6b56e
+AUX conveysdl-1.3-speed.patch 1410 BLAKE2B 2e0716f1a40e2a42cd9e30e3154f3b79dd4691e97a530761d8f4b6d3f1069382c5e430b56df5f60928f1c249257652c8c4b5800ba08a5d6881bd9d8267dfd378 SHA512 8766d4c522b58f9def8d7f1a9b928287643068daf6594fde91ba1fe9aa6363eea36958d98ca3aa40eead761eda7a253209cf74143b4a6333f2e0ed9bdc116fbf
 DIST conveysdl.1.3.tar 429568 BLAKE2B 950952ad311bb51855bbd1cf3bf25b750d067db1cef8333f44ac3a96f30033f700efb9771d3050be6a3acc63c79b49fa8d64a1a11a088a777a13f21fb82a4c81 SHA512 fe6f91cdd63ae1019cb99613618e44ceeddb4080ad5e50bd8ce0abf27e057617d3658a29b2faf668cbc3b0887f1a4a05cadadb060f69d850c3d85c9e7190dd8a
-EBUILD conveysdl-1.3.ebuild 1220 BLAKE2B ee6064426755b71910a75b1a770307da5f5f48d8a7aceaffc492c1e1d514ac8f137fd114d355eae4e664814b2fd6aa9b2a5ebaa338b8a60a4aa813ceff286423 SHA512 293d162226204f7a63840725559f59b38596eb90e0413f86f670d7b67d48cf1f4872c1dab3e6cf347987a521beaafed0f37caef5a5d6d75c8f91bd82bf64d3d7
+EBUILD conveysdl-1.3-r1.ebuild 1193 BLAKE2B 38abb28c4be7f04bb8274b67f7f11fca9c6cd3ebd21d7f3fae58bbca584e6c340c03cbc19610a74b20a62a74a7dc75201a941c0fad30ad1d4af39b3b87439b21 SHA512 d4cbf98bb28f849369a83e4a6bec021d5c9ab1b01b19d51a2c35b88b178226e237671461097941769219d58a34cecea23c44e576e8f03db98eb86d9dd4a97731
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/conveysdl/conveysdl-1.3.ebuild b/games-arcade/conveysdl/conveysdl-1.3-r1.ebuild
index 53d4dd6d48b9..5c39dd327ee7 100644
--- a/games-arcade/conveysdl/conveysdl-1.3.ebuild
+++ b/games-arcade/conveysdl/conveysdl-1.3-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 eutils toolchain-funcs games
+EAPI=6
+inherit desktop toolchain-funcs
 
 DESCRIPTION="Guide the blob along the conveyer belt collecting the red blobs"
 HOMEPAGE="http://www.cloudsprinter.com/software/conveysdl/"
@@ -17,9 +17,11 @@ DEPEND="media-libs/libsdl[sound,video]
 	media-libs/sdl-mixer"
 RDEPEND=${DEPEND}
 
-S=${WORKDIR}
+S="${WORKDIR}"
 
 src_prepare() {
+	default
+
 	# Incomplete readme
 	sed -i \
 		-e 's:I k:use -nosound to disable sound\n\nI k:' \
@@ -29,7 +31,7 @@ src_prepare() {
 		-e 's:SDL_Mi:SDL_mi:' \
 		main.c || die
 
-	epatch \
+	eapply \
 		"${FILESDIR}"/${P}-arrays.patch \
 		"${FILESDIR}"/${P}-speed.patch
 }
@@ -38,17 +40,16 @@ src_compile() {
 	emake main \
 		CC="$(tc-getCC)" \
 		CFLAGS="${CFLAGS} $(sdl-config --cflags) \
-			-DDATA_PREFIX=\\\"${GAMES_DATADIR}/${PN}/\\\" \
+			-DDATA_PREFIX=\\\"/usr/share/${PN}/\\\" \
 			-DENABLE_SOUND" \
 		LDLIBS="-lSDL_mixer $(sdl-config --libs)"
 }
 
 src_install() {
-	newgamesbin main ${PN}
-	insinto "${GAMES_DATADIR}"/${PN}
+	newbin main ${PN}
+	insinto /usr/share/${PN}
 	doins -r gfx sounds levels
 	newicon gfx/jblob.bmp ${PN}.bmp
 	make_desktop_entry ${PN} Convey /usr/share/pixmaps/${PN}.bmp
-	dodoc readme
-	prepgamesdirs
+	einstalldocs
 }
diff --git a/games-arcade/conveysdl/files/conveysdl-1.3-arrays.patch b/games-arcade/conveysdl/files/conveysdl-1.3-arrays.patch
index a3894e58d3d3..a6286d96f145 100644
--- a/games-arcade/conveysdl/files/conveysdl-1.3-arrays.patch
+++ b/games-arcade/conveysdl/files/conveysdl-1.3-arrays.patch
@@ -1,5 +1,5 @@
---- main.c.org	2010-07-28 13:16:20.552161148 +0300
-+++ main.c	2010-07-29 20:43:14.714543259 +0300
+--- a/main.c.org	2010-07-28 13:16:20.552161148 +0300
++++ b/main.c	2010-07-29 20:43:14.714543259 +0300
 @@ -22,7 +22,7 @@
  
  SDL_Surface *bletters;
diff --git a/games-arcade/conveysdl/files/conveysdl-1.3-speed.patch b/games-arcade/conveysdl/files/conveysdl-1.3-speed.patch
index 2b5a6205650c..6d6d13eb11be 100644
--- a/games-arcade/conveysdl/files/conveysdl-1.3-speed.patch
+++ b/games-arcade/conveysdl/files/conveysdl-1.3-speed.patch
@@ -1,5 +1,5 @@
---- org/main.c	2010-07-30 10:41:21.392783010 +0300
-+++ main.c	2010-07-30 10:44:35.791690958 +0300
+--- a/main.c	2010-07-30 10:41:21.392783010 +0300
++++ b/main.c	2010-07-30 10:44:35.791690958 +0300
 @@ -52,6 +52,7 @@