gentoo resync : 29.06.2020

4 files changed, 144 insertions, 12 deletions

diff --git a/games-puzzle/mures/Manifest b/games-puzzle/mures/Manifest
index 99ec18b21954..23974a94b28c 100644
--- a/games-puzzle/mures/Manifest
+++ b/games-puzzle/mures/Manifest
@@ -1,5 +1,6 @@
+AUX mures-0.5-fix-fno-common.patch 2310 BLAKE2B 7ea4cd8bc666c8983a608f660282d5ec50f56016ed4bdb471a9d07209bcb7e136693ca5daace566b7217ff1a2fdacf085fe09e00c196a8c71caeefd399a4e4cf SHA512 8aa7cf142609f41102f31aa5d629e6da55bb18aec067af650058b838551b7e2903a9b7ace7dd452f6929f6b89f670e17afb05ac5a0af812cae28078dd6e6e889
 AUX mures-0.5-save.patch 654 BLAKE2B 57992955c9bb850ec7f13c50039eaa02d81540abbe94dba7cc0d034d5dab3c0f63d82fcdeb666efc664494e39f47c152f84efebaa1b3c2a108b55ff5c960dacc SHA512 b1762660ecd5cd373d39957003a0e455c3f981886191955eca2ccdd54d6ce2a302f6eaed3d022ac5acd64cabed364a6c1dc6cbdf53e0fd32208ce3d12db0a187
-AUX mures-0.5-underlink.patch 300 BLAKE2B f20a6a2e2e82e0f16a9ed8f49d2cf4071d4f19c2149f12b98572e0e4a8e42e04556d02bd93675f5805dae96a496ea4586ce064ea2f33c33586a24afecab889ce SHA512 ffbd6e23fab8fff7ccb191c1fcc4f405b2c5cc6cffaa388eca11185244a5328d16b8f3301ce1dd29ba036637e281e55b08ac39c039ff187cac35f01f078ced21
+AUX mures-0.5-underlink.patch 382 BLAKE2B bd7a9cbf3225b9579a8f618f0c1eb3b2a2fdda37d8fe69c615af71bc084fea3d07f6b5a6c8e48148dc890c6075438573c3c70aa0ed9d7b5b6a9f67756fdac176 SHA512 9eb4dc66ad72ee3b9b7169b6d6f1922bfdca78cda5594c70f8a82231c096bbfea509cfa0d32881ee295b426fc3669dc5bdf8c44b203d8402d15464c6bbdac5c8
 DIST mures-0.5.tar.gz 638528 BLAKE2B 35861cbc0497091c716664a6a1d38884a64981f6228637cbeb93b4be64c42bf84b8033c2f5d95f197c26436fbf621ff8322ffb5aa3dc241b50372e94a395599b SHA512 907b22adffcc0457d866da27bd11d61663c6a1eed1c0aa4b437f8e341065df86f2ab06851619e2fa4088aa0b2becaf9376bad693c83345f8d1ee862c31740eff
-EBUILD mures-0.5-r1.ebuild 2079 BLAKE2B 9fded27b1529d579f3dd27673472396507f14061ea14f43c2d1997cc059241e432fd63bbdfc4bf9aefd597499f50f5069fd46072eb48b3879f48a193129414d7 SHA512 7bcaf4b664fe92b1ec3b4f5da68875daf5f6c0c64705ace569b082a6a8b6a6ed4c5609a2b3c9c7993d7b5efbcd4e56ba6b48b1b6843fec94f48466075cdac049
+EBUILD mures-0.5-r1.ebuild 2160 BLAKE2B 4b135fca198a1f1765eeeae334211c307e52016866f8969be5f0572c5396b4c344d0c2feeecb245edc7f723212af242fe3717aa543a98171a1aad568e474311c SHA512 3f1d1c0d98fb60ecfc617170be76f31a9247dda73dbb7a77d60cd50e4c59fd93d5ad01c6fde61ae26e51f435e33cb85ba85d4c0475ec4960e19e4ca0ccff77c3
 MISC metadata.xml 328 BLAKE2B 10dbb393d6e09fe667ad28913d38f785c0d8d51da581bbc2fe2d19c18faea716bc901097829cc4927b6d3d0265ecd53e62635461f6bb3619cba1540b7b033c66 SHA512 f6818639d9ff510efe1dc98505eb03086d46024def2a1b5fef5273181e6eef91135ef4e7902613776da51a951c50373b5cc80848a9887d3919f7adfd9ef40f18
diff --git a/games-puzzle/mures/files/mures-0.5-fix-fno-common.patch b/games-puzzle/mures/files/mures-0.5-fix-fno-common.patch
new file mode 100644
index 000000000000..b07be91c0175
--- /dev/null
+++ b/games-puzzle/mures/files/mures-0.5-fix-fno-common.patch
@@ -0,0 +1,114 @@
+--- a/src/client.c
++++ b/src/client.c
+@@ -37,7 +37,7 @@
+ 
+ int client_initialized = 0;
+ UDPsocket local_socket = NULL;
+-UDPpacket *packet;
++extern UDPpacket *packet;
+ 
+ #define PACKET_POOL_SIZE 20
+ 
+--- a/src/game_output.c
++++ b/src/game_output.c
+@@ -31,6 +31,11 @@
+ #include "go_sdl.h"
+ #include "go_gl.h"
+ 
++void (*game_output_handle_event)(game *g, int event, float x, float y, direction dir);
++void (*game_output_refresh)(game *g, SDL_Surface *out);
++void (*game_output_bigchange)(game *g);
++void (*game_output_exit)(game *g);
++
+ void game_output_init(game *g, int type)
+ {
+   switch(type) {
+--- a/src/game_output.h
++++ b/src/game_output.h
+@@ -38,10 +38,10 @@
+   GL
+ };
+ 
+-void (*game_output_handle_event)(game *g, int event, float x, float y, direction dir);
+-void (*game_output_refresh)(game *g, SDL_Surface *out);
+-void (*game_output_bigchange)(game *g);
+-void (*game_output_exit)(game *g);
++extern void (*game_output_handle_event)(game *g, int event, float x, float y, direction dir);
++extern void (*game_output_refresh)(game *g, SDL_Surface *out);
++extern void (*game_output_bigchange)(game *g);
++extern void (*game_output_exit)(game *g);
+ 
+ void game_output_init(game *g, int type);
+ 
+--- a/src/gi_sdl.c
++++ b/src/gi_sdl.c
+@@ -60,6 +60,7 @@
+ #define GI (*(gi_sdl_data*)g->input)
+ 
+ SDL_Joystick *js;
++gi_sdl_settings ks;
+ 
+ int gi_sdl_player_exists(game *g, int p)
+ {
+--- a/src/gi_sdl.h
++++ b/src/gi_sdl.h
+@@ -88,7 +88,7 @@
+   int joy_y[MAX_JOY];
+ } gi_sdl_settings;  
+ 
+-gi_sdl_settings ks;
++extern gi_sdl_settings ks;
+ 
+ int gi_sdl_player_exists(game *g, int p);
+ grid_int_position gi_sdl_player_grid_pos(game *g, int p);
+--- a/src/gui.h
++++ b/src/gui.h
+@@ -47,6 +47,6 @@
+ void gui_remove_object(int i);
+ void gui_clear();
+ 
+-int factor_h, factor_w;
++extern int factor_h, factor_w;
+ 
+ #endif
+--- a/src/lua.c
++++ b/src/lua.c
+@@ -22,6 +22,7 @@
+ }
+ */
+ 
++lua_State *L;
+ 
+ static int lua_write(lua_State *L)
+ {
+--- a/src/lua.h
++++ b/src/lua.h
+@@ -4,7 +4,7 @@
+ #include "lua/lua.h"
+ 
+ 
+-lua_State *L;
++extern lua_State *L;
+ 
+ int lua_init();
+ void lua_exit();
+--- a/src/main.c
++++ b/src/main.c
+@@ -44,6 +44,7 @@
+ #include "lua.h"
+ 
+ root_type root;
++int opengl;
+ 
+ void root_quit()
+ {
+--- a/src/main.h
++++ b/src/main.h
+@@ -44,6 +44,6 @@
+ 
+ void root_quit();
+ 
+-int opengl;
++extern int opengl;
+ 
+ #endif
diff --git a/games-puzzle/mures/files/mures-0.5-underlink.patch b/games-puzzle/mures/files/mures-0.5-underlink.patch
index 3acf0b0f7233..614a2880cf3b 100644
--- a/games-puzzle/mures/files/mures-0.5-underlink.patch
+++ b/games-puzzle/mures/files/mures-0.5-underlink.patch
@@ -1,5 +1,15 @@
---- 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
+--- a/configure.in
++++ b/configure.in
+@@ -7,6 +7,7 @@
+ AC_PROG_MAKE_SET
+ AC_PROG_CC
+ AC_PROG_RANLIB
++AM_PROG_AR
+ AC_PROG_INSTALL
+ 
+ dnl Checks for libraries.
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -1,8 +1,8 @@
  bin_PROGRAMS = mures
  
diff --git a/games-puzzle/mures/mures-0.5-r1.ebuild b/games-puzzle/mures/mures-0.5-r1.ebuild
index 36b51630c7e7..6a16b35658b0 100644
--- a/games-puzzle/mures/mures-0.5-r1.ebuild
+++ b/games-puzzle/mures/mures-0.5-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit autotools desktop
 
 DESCRIPTION="A clone of Sega's Chu Chu Rocket"
@@ -13,12 +14,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="opengl"
 
-DEPEND="media-libs/libsdl
+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="/usr/share/${PN}"
@@ -39,12 +40,14 @@ src_prepare() {
 		src/maps/battle/Makefile.am \
 		|| die "sed failed"
 
+	# GCC 10 / -fno-common
+	eapply "${FILESDIR}"/${P}-fix-fno-common.patch
 	eapply "${FILESDIR}"/${P}-underlink.patch
 
-	mv configure.in configure.ac
+	mv configure.{in,ac} || die
 	eautoreconf
 
-	cd src
+	cd src || die
 
 	# Save to HOME
 	eapply "${FILESDIR}"/${P}-save.patch
@@ -81,10 +84,14 @@ src_prepare() {
 src_install() {
 	# Remove makefiles before installation
 	rm -f src/*/Makefile* src/*/*/Makefile* || die "removing makefiles"
+
+	dobin src/mures
+
 	insinto "${dir}"
 	doins -r src/{gui,images,sounds,textures,maps,*.lua}
+
 	einstalldocs
-	dobin src/mures
+
 	newicon src/images/cat_right.png ${PN}.png
 	make_desktop_entry ${PN} "Mures"
 }