gentoo resync : 19.04.2018

4 files changed, 28 insertions, 29 deletions

diff --git a/games-arcade/insaneodyssey/Manifest b/games-arcade/insaneodyssey/Manifest
index a35226838742..8445079c8599 100644
--- a/games-arcade/insaneodyssey/Manifest
+++ b/games-arcade/insaneodyssey/Manifest
@@ -1,5 +1,5 @@
-AUX insaneodyssey-000311-datafiles.patch 1601 BLAKE2B 3380b1d2fcc5a26a242b0d03004a0fbc162ff2f84f8093b1920c2c2b8b3da676183e6e541c4bc3d614fd30ae86cd8e83108ffdc56e694f487f38e4d6b1b45a7a SHA512 8ad0483bd1b068f8350ccc9f8b3c26f8a3be45c8a6f20dc6bd26f285d7888511f856c4487316a11feb916b7bad862e5c51e8af286d984086678663c8e315a4f4
-AUX insaneodyssey-000311-gcc6.patch 416 BLAKE2B ddb56e283320111872bec4647f1076c5b9ea2b67c19740cd50a39716ca1bd5f55fbf80b9b85f74294dbcfaf41d67d5506b6ce6e5b14ab1d365620bc383d651f3 SHA512 d68dd504a93c4678c2db821e51074bfa17b79a5c6dc4a7c42d5654cb1fb776a0e6d00c118d8d22555068c3d61c1708cf08039900664ecaf51f8967fda558e538
+AUX insaneodyssey-000311-datafiles.patch 1605 BLAKE2B 2418e72f6b74dad8c00b26235ffbb8df1394d90e639994d080be3845c02f7d278c262405682d9c8ca2ac8a15b6dd5695224461fdc13f96b61dc01ea70ed20da4 SHA512 b0a7a32f5463474435e17d56169e7a5f79a624e508df8142760ba24c22625707aa409f2a5381502676a6af86b2857a2db739e36cdb2471cf4a98181e5532be8d
+AUX insaneodyssey-000311-gcc6.patch 388 BLAKE2B 4976b873e3a74992cab91d155a8ab280d689c067cbb6e66944cf8b7a4a0c82c1f0e18fab1f6c3f9339b49fd0d73ef98f4a5382bb60844afe849cde3ef5d7a99b SHA512 7f634c129bcdd1a54ec196792dbfe18b0d26823907efc92c3389b5f3280c8243cd23d8e980744673bb2cabbf7c44203e4b7ec320ebe729300566adf39d6ee1f3
 DIST io000311.tar.gz 839950 BLAKE2B 4974471c69541afcb98764a3bf7c71c72afba7e9301f540eb1af85611bada547e87b491205f9fb9ba41e6e8e52326eb5e0b4cf07bf3d02259280ea6b2e5be162 SHA512 9fbf79daf1886c31a6309036cf382c2e175e3c280d6d5aa822971e977e97227f4290474c272afd7ed8218b2cc7e66b407b37522207b30225a41488201a244d96
-EBUILD insaneodyssey-000311.ebuild 1605 BLAKE2B 0b29e2032eaf077bb5f4705fef64684b4d8536fb06b49af1e4387c9f9a5e6e04347a474a3b144675c824579f57c978b71c2a90f79eb55e0bffd35a98c03b2999 SHA512 6f8f49e90d9098f6e283af91866518606ca7aa6085dcfe9a0f44cc754d5888201b0a569de6c09d8e3c75ee3ee9c85f3dd67f9a58e0a6448f35f44c3dc404efd4
+EBUILD insaneodyssey-000311-r1.ebuild 1428 BLAKE2B 4abc6a58c24847da2364fa937e0bbfa752a2399e1be021dde475dcf528e3cc8706c405d9d7e99765ebd976f378e7a92399c6b750fd7a4bc4af2472cc7ad6a79b SHA512 46273e06fdddd0c40caef61f986573732a6508a398103491f6584d514af76dc8021c556439f5f3521a919df7f7debd5912590aa93695b743e4500530888c4a69
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/insaneodyssey/files/insaneodyssey-000311-datafiles.patch b/games-arcade/insaneodyssey/files/insaneodyssey-000311-datafiles.patch
index 417d8396e19b..3aab4eeaf9da 100644
--- a/games-arcade/insaneodyssey/files/insaneodyssey-000311-datafiles.patch
+++ b/games-arcade/insaneodyssey/files/insaneodyssey-000311-datafiles.patch
@@ -1,5 +1,5 @@
---- io.cpp.orig	2004-06-01 19:11:16.000000000 +0300
-+++ io.cpp	2004-06-01 19:21:14.000000000 +0300
+--- a/io.cpp.orig	2004-06-01 19:11:16.000000000 +0300
++++ b/io.cpp	2004-06-01 19:21:14.000000000 +0300
 @@ -42,7 +42,11 @@
  {
  	SDL_Surface *image, *surface;
diff --git a/games-arcade/insaneodyssey/files/insaneodyssey-000311-gcc6.patch b/games-arcade/insaneodyssey/files/insaneodyssey-000311-gcc6.patch
index 74b4bf644d49..4fd35438d24b 100644
--- a/games-arcade/insaneodyssey/files/insaneodyssey-000311-gcc6.patch
+++ b/games-arcade/insaneodyssey/files/insaneodyssey-000311-gcc6.patch
@@ -1,7 +1,7 @@
 Bug: https://bugs.gentoo.org/600894
 
---- a/insaneodyssey/io.cpp
-+++ b/insaneodyssey/io.cpp
+--- a/io.cpp
++++ b/io.cpp
 @@ -22,6 +22,7 @@
  #include <stdlib.h>
  #include <stdio.h>
diff --git a/games-arcade/insaneodyssey/insaneodyssey-000311.ebuild b/games-arcade/insaneodyssey/insaneodyssey-000311-r1.ebuild
index ad16a4bd5c1a..0383afc0b2b3 100644
--- a/games-arcade/insaneodyssey/insaneodyssey-000311.ebuild
+++ b/games-arcade/insaneodyssey/insaneodyssey-000311-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils games
+EAPI=6
+inherit desktop
 
 DESCRIPTION="Help West Muldune escape from a futuristic mental hospital"
 HOMEPAGE="http://members.fortunecity.com/rivalentertainment/iox.html"
@@ -17,33 +17,33 @@ IUSE=""
 
 DEPEND="media-libs/libsdl[sound,video]
 	media-libs/sdl-mixer
-	media-libs/sdl-image"
-RDEPEND=${DEPEND}
+	media-libs/sdl-image
+"
+RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
 
 src_prepare() {
+	default
+
 	cd ${PN}
 
 	# Modify data load code and paths to game data
-	sed -e "s:/usr/share/games:${GAMES_DATADIR}:" \
-		"${FILESDIR}"/${P}-datafiles.patch > "${T}"/datafiles.patch \
-		|| die
-		epatch "${T}"/datafiles.patch
+	eapply "${FILESDIR}"/${P}-datafiles.patch
 
-	epatch "${FILESDIR}"/${P}-gcc6.patch
+	eapply "${FILESDIR}"/${P}-gcc6.patch
 
 	sed -i \
-		-e "/lvl/s:^:${GAMES_DATADIR}/${PN}/:" \
-		-e "s:night:${GAMES_DATADIR}/${PN}/night:" \
+		-e "/lvl/s:^:/usr/share/${PN}/:" \
+		-e "s:night:/usr/share/${PN}/night:" \
 		levels.dat || die
 	sed -i \
-		-e "s:tiles.dat:${GAMES_DATADIR}/${PN}/tiles.dat:" \
-		-e "s:sprites.dat:${GAMES_DATADIR}/${PN}/sprites.dat:" \
-		-e "s:levels.dat:${GAMES_DATADIR}/${PN}/levels.dat:" \
-		-e "s:IO_T:${GAMES_DATADIR}/${PN}/IO_T:" \
-		-e "s:tiles.att:${GAMES_DATADIR}/${PN}/tiles.att:" \
-		-e "s:shot:${GAMES_DATADIR}/${PN}/shot:" \
+		-e "s:tiles.dat:/usr/share/${PN}/tiles.dat:" \
+		-e "s:sprites.dat:/usr/share/${PN}/sprites.dat:" \
+		-e "s:levels.dat:/usr/share/${PN}/levels.dat:" \
+		-e "s:IO_T:/usr/share/${PN}/IO_T:" \
+		-e "s:tiles.att:/usr/share/${PN}/tiles.att:" \
+		-e "s:shot:/usr/share/${PN}/shot:" \
 		io.cpp || die
 	sed -i \
 		-e 's:\[32:[100:' \
@@ -52,10 +52,9 @@ src_prepare() {
 
 src_install() {
 	cd ${PN}
-	dogamesbin ${PN}
-	insinto "${GAMES_DATADIR}"/${PN}
+	dobin ${PN}
+	insinto /usr/share/${PN}
 	doins *bmp *png *dat *att *lvl *wav *mod *IT
 	newicon west00r.png ${PN}.png
 	make_desktop_entry ${PN} "Insane Odyssey"
-	prepgamesdirs
 }