gentoo resync : 02.05.2018

4 files changed, 24 insertions, 21 deletions

diff --git a/games-puzzle/mures/Manifest b/games-puzzle/mures/Manifest
index 9abc0981914a..99ec18b21954 100644
--- a/games-puzzle/mures/Manifest
+++ b/games-puzzle/mures/Manifest
@@ -1,5 +1,5 @@
-AUX mures-0.5-save.patch 646 BLAKE2B 32279c5cae1eb5dddfa1bfe2e3456564bd14e1abd63c26dd358f1704aa76115a6ac0876694549349a824d1814b65c970176a6e7521f89ea9b592a3570bc5827d SHA512 2b3717c107fc82010ca9a894d68895d438bbd3e36c6d192a49a2f802f7b42abc717b07d278167176813965bcfbaf1ecab99e7edc30abaf1536f9c6e52e18c0b0
-AUX mures-0.5-underlink.patch 296 BLAKE2B e9e9e194d9e1fbbe531f8f01cc1380bedb1a870e5b5f8546cc543019c58016281be91404762ef64bd5f28fdb90928ca9f225ca35a1ea214775ad68e0d9beceb4 SHA512 51e32719135883847b326b6c5f3f0954e1df0c3f4d84cfc1e28a6e82974d25c7d44ba552796ee01cf99db7291c2d6c849a777cd03099802618ed56142eea57ab
+AUX mures-0.5-save.patch 654 BLAKE2B 57992955c9bb850ec7f13c50039eaa02d81540abbe94dba7cc0d034d5dab3c0f63d82fcdeb666efc664494e39f47c152f84efebaa1b3c2a108b55ff5c960dacc SHA512 b1762660ecd5cd373d39957003a0e455c3f981886191955eca2ccdd54d6ce2a302f6eaed3d022ac5acd64cabed364a6c1dc6cbdf53e0fd32208ce3d12db0a187
+AUX mures-0.5-underlink.patch 300 BLAKE2B f20a6a2e2e82e0f16a9ed8f49d2cf4071d4f19c2149f12b98572e0e4a8e42e04556d02bd93675f5805dae96a496ea4586ce064ea2f33c33586a24afecab889ce SHA512 ffbd6e23fab8fff7ccb191c1fcc4f405b2c5cc6cffaa388eca11185244a5328d16b8f3301ce1dd29ba036637e281e55b08ac39c039ff187cac35f01f078ced21
 DIST mures-0.5.tar.gz 638528 BLAKE2B 35861cbc0497091c716664a6a1d38884a64981f6228637cbeb93b4be64c42bf84b8033c2f5d95f197c26436fbf621ff8322ffb5aa3dc241b50372e94a395599b SHA512 907b22adffcc0457d866da27bd11d61663c6a1eed1c0aa4b437f8e341065df86f2ab06851619e2fa4088aa0b2becaf9376bad693c83345f8d1ee862c31740eff
-EBUILD mures-0.5.ebuild 2014 BLAKE2B 6abdf8f7d8a12f150544cc5f6b334e33954d770a7c2fda3a2fb299235eab51e4cf899c7c4dc52d56df4474067f313d9cf26a874435760f141e08c98d9fb56342 SHA512 ec4fc3db2d6cb97eeb4917beb7af25725961c0c01f2fc27e3a2360de9ab854b415c30f285aa4fdd9be93c30120409c405deaa42997131c0db3f94eb7e5625ab3
+EBUILD mures-0.5-r1.ebuild 2079 BLAKE2B 9fded27b1529d579f3dd27673472396507f14061ea14f43c2d1997cc059241e432fd63bbdfc4bf9aefd597499f50f5069fd46072eb48b3879f48a193129414d7 SHA512 7bcaf4b664fe92b1ec3b4f5da68875daf5f6c0c64705ace569b082a6a8b6a6ed4c5609a2b3c9c7993d7b5efbcd4e56ba6b48b1b6843fec94f48466075cdac049
 MISC metadata.xml 328 BLAKE2B 10dbb393d6e09fe667ad28913d38f785c0d8d51da581bbc2fe2d19c18faea716bc901097829cc4927b6d3d0265ecd53e62635461f6bb3619cba1540b7b033c66 SHA512 f6818639d9ff510efe1dc98505eb03086d46024def2a1b5fef5273181e6eef91135ef4e7902613776da51a951c50373b5cc80848a9887d3919f7adfd9ef40f18
diff --git a/games-puzzle/mures/files/mures-0.5-save.patch b/games-puzzle/mures/files/mures-0.5-save.patch
index 704dcf1f53bc..697db8ef7a28 100644
--- a/games-puzzle/mures/files/mures-0.5-save.patch
+++ b/games-puzzle/mures/files/mures-0.5-save.patch
@@ -1,5 +1,5 @@
---- gi_sdl.c
-+++ gi_sdl.c
+--- a/gi_sdl.c
++++ b/gi_sdl.c
 @@ -606,6 +606,7 @@
  {
    int i,found;
@@ -19,8 +19,8 @@
        case SDLK_F1:
  	game_restart(g);
 
---- output.c
-+++ output.c
+--- a/output.c
++++ b/output.c
 @@ -215,7 +215,8 @@
  
  void output_screenshot()
diff --git a/games-puzzle/mures/files/mures-0.5-underlink.patch b/games-puzzle/mures/files/mures-0.5-underlink.patch
index 805cd0c7b35d..3acf0b0f7233 100644
--- a/games-puzzle/mures/files/mures-0.5-underlink.patch
+++ b/games-puzzle/mures/files/mures-0.5-underlink.patch
@@ -1,5 +1,5 @@
---- src/Makefile.am.old	2011-06-21 14:39:14.404333493 +0200
-+++ src/Makefile.am	2011-06-21 14:39:30.538340283 +0200
+--- a/src/Makefile.am.old	2011-06-21 14:39:14.404333493 +0200
++++ b/src/Makefile.am	2011-06-21 14:39:30.538340283 +0200
 @@ -1,8 +1,8 @@
  bin_PROGRAMS = mures
  
diff --git a/games-puzzle/mures/mures-0.5.ebuild b/games-puzzle/mures/mures-0.5-r1.ebuild
index 10bd791881fe..36b51630c7e7 100644
--- a/games-puzzle/mures/mures-0.5.ebuild
+++ b/games-puzzle/mures/mures-0.5-r1.ebuild
@@ -1,9 +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 autotools eutils games
+EAPI=6
+inherit autotools desktop
 
 DESCRIPTION="A clone of Sega's Chu Chu Rocket"
 HOMEPAGE="http://mures.sourceforge.net/"
@@ -18,12 +17,15 @@ DEPEND="media-libs/libsdl
 	media-libs/sdl-image
 	media-libs/sdl-net
 	media-libs/sdl-ttf
-	opengl? ( virtual/opengl )"
+	opengl? ( virtual/opengl )
+"
 RDEPEND="${DEPEND}"
 
-dir=${GAMES_DATADIR}/${PN}
+dir="/usr/share/${PN}"
 
 src_prepare() {
+	default
+
 	# Disable OpenGL support if USE flag is not set
 	if ! use opengl ; then
 		sed -i \
@@ -37,14 +39,15 @@ src_prepare() {
 		src/maps/battle/Makefile.am \
 		|| die "sed failed"
 
-	epatch "${FILESDIR}"/${P}-underlink.patch
+	eapply "${FILESDIR}"/${P}-underlink.patch
 
+	mv configure.in configure.ac
 	eautoreconf
 
 	cd src
 
 	# Save to HOME
-	epatch "${FILESDIR}"/${P}-save.patch
+	eapply "${FILESDIR}"/${P}-save.patch
 
 	# Modify game data & scrips path
 	sed -i \
@@ -80,8 +83,8 @@ src_install() {
 	rm -f src/*/Makefile* src/*/*/Makefile* || die "removing makefiles"
 	insinto "${dir}"
 	doins -r src/{gui,images,sounds,textures,maps,*.lua}
-	dodoc README TODO ChangeLog AUTHORS
-	dogamesbin src/mures
-
-	prepgamesdirs
+	einstalldocs
+	dobin src/mures
+	newicon src/images/cat_right.png ${PN}.png
+	make_desktop_entry ${PN} "Mures"
 }