gentoo resync : 25.11.2020

3 files changed, 140 insertions, 8 deletions

diff --git a/games-rpg/daimonin-client/Manifest b/games-rpg/daimonin-client/Manifest
index 73c0b39cbdf7..478aad13f047 100644
--- a/games-rpg/daimonin-client/Manifest
+++ b/games-rpg/daimonin-client/Manifest
@@ -1,7 +1,8 @@
 AUX daimonin-client-0.10.5-datadir.patch 983 BLAKE2B 810f36eed097c19a0d77ea89d60a4ac9acc83e2fe74d4563d77789fbfbdd5d9823c0e9271bcd113c00e6f6044c910338596c967d3fd68304863d0f9008da3324 SHA512 eb4748894c0722ee112efc3953a14784eb13237919813c057afddc09104f250f346c29a1a224bd3ce8a44b22af4fa2b59f826aa5eb96fb45a51f276f743fa3fa
 AUX daimonin-client-0.10.5-nozlib.patch 1094 BLAKE2B d617dbee2d2a23eff6b6330c59c2fe7501ec06437d5d179611ea9ab50a2e15bacc7e948d3cd114bf1745d6649e80f503b8e364752c9f689c4f95170d3ebf74bb SHA512 31ef58b81c669f7a8c685355dfb37d85383891db4534c3b62b0d9f5beaed6cb6d4be34657acd109287dc85d83a6c81950322667729b36552394c17a9b0bfc989
 AUX daimonin-client-0.10.8-fix-build-system.patch 2538 BLAKE2B 1eb570088a9bd44489ce63eeef445a3d9b27f421abb28cad9f83eb622b7da33ed94ec9265f0c0d59744521367dd82d6bc4ba7001e1fd938629b3ec4bb0f9f8ee SHA512 baf333aad05a662bf38e6579cb6f8bfcb0b1fbf2a48191df28a96fe3d20585f7a2ad211d96107a3f99245bc99b877ca140b450111e7466d866e07d32199c737d
+AUX daimonin-client-0.10.8-fno-common.patch 3617 BLAKE2B e9454ca77e8332bc8ce5b592dfc9c173d4a79f48649c32dba8180b778718779f988a4c1f3cf89a2f20f70b3292110732186eb743e8e608b49c692c9611fcbaaf SHA512 ad7a14d6d8feca43a4ffbaf5f6869a89b9c294b110ebec07755e2dcb0d1e06015388dfddec8d8f40dc62d9359e30986aa9706a2b85ef36fdfc139c2132b28bb9
 DIST daimonin-client-0.10.8.zip 51894462 BLAKE2B 9803b0e597134fa605ffc4e38b2f6f58cd76d45141bb0d5c5387e9b507c4b80b4a566d266b622df7ea38b3e9eb00e839981bcb999ac2d14e59a8cff37340f6fa SHA512 f4f5891697f96a60a8ee79973b0172b544cbae25b2d8787e0a4e9113d95be3b41b8c29c80ba5cbaf7548055e4c847456fa364346489f4d6ad165b984cfd64531
 DIST daimoninMusicLQ20100827.zip 24293301 BLAKE2B 35ee421c0db8f0ff29768b58af8fbc1d804d24534b8558631c97cf36b624999d0e5f422cd32e4a13bc09765b183bfd52270b33f2614023202211399e3d5da484 SHA512 f24bba24c0e9a79469511315c608c464568f3ee0dc05b3d83c791512fa51eae07669dc175e7672cc8b31764a7bdff5c975ac2b13e2d7b0e5287717e188f1d439
-EBUILD daimonin-client-0.10.8.ebuild 1483 BLAKE2B c67064029f915a15e5be0ce393275a05163ccd6ca9d16f1fc73fa9ae153b2ce85b55c2d6bb255b0f149bc60d75c2c902f1476859eac6b10bf92d29f2482bca6c SHA512 46898d7d1b725f963ceaf4e12ea8833feb37ae7e294f589789b87a1c51fd0bb5d404a6442a799ac59e061689ff6752482f3d623477cd1a27a6ffd7e4b1683a31
+EBUILD daimonin-client-0.10.8.ebuild 1548 BLAKE2B b7aa99bea8e527ec406c20606416ce3c58056d85d154537980afbb89e4b2f4ae4eef98d819c0b7447ed2d8dec63df4557e21c8ab14d24bcc364eabccafdac097 SHA512 9bed8d9bb8d67126fca2798a5edc003f677e91444242f71d69f1ceff9d73016ef7f4d21b73cd55cac8080556a0d2916ac12f0cb3008a04eac719f565d8156493
 MISC metadata.xml 408 BLAKE2B d816c7d0cd53dc68147f8a23d89d46da21defb09e0b9717b777b23881189ec61ae82ed3bb42dbccadd94a34421c6b92755bb20cdb60bd2a17826dcc128332930 SHA512 039f6849c28f9c21b7e2854314fcd0ff9b356b3983e68c0a4a2eb8e96893475e4333f7408c233f8f9651c4613a2683a63a4f5da58d11555d34712f9ebe0a2f6b
diff --git a/games-rpg/daimonin-client/daimonin-client-0.10.8.ebuild b/games-rpg/daimonin-client/daimonin-client-0.10.8.ebuild
index 3ee1bd720d75..4cd5b7623861 100644
--- a/games-rpg/daimonin-client/daimonin-client-0.10.8.ebuild
+++ b/games-rpg/daimonin-client/daimonin-client-0.10.8.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools eutils
+inherit autotools desktop
 
 DESCRIPTION="A graphical 2D tile-based MMORPG"
 HOMEPAGE="http://daimonin.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~soap/distfiles/${P}.zip
+SRC_URI="
+	https://dev.gentoo.org/~soap/distfiles/${P}.zip
 	music? ( mirror://sourceforge/daimonin/daimoninMusicLQ20100827.zip )"
 
 LICENSE="GPL-2"
@@ -22,10 +23,10 @@ RDEPEND="
 	media-libs/sdl-mixer[vorbis]
 	net-misc/curl
 	sys-libs/zlib:="
-DEPEND="${RDEPEND}
-	app-arch/unzip"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip"
 
-S=${WORKDIR}/daimonin-code-8183-trunk/client/make/linux
+S="${WORKDIR}/daimonin-code-8183-trunk/client/make/linux"
 
 src_unpack() {
 	unpack ${P}.zip
@@ -42,6 +43,7 @@ src_prepare() {
 
 	pushd ../../src >/dev/null || die
 		eapply "${FILESDIR}"/${PN}-0.10.5-datadir.patch
+		eapply "${FILESDIR}"/${PN}-0.10.8-fno-common.patch
 	popd >/dev/null || die
 
 	eapply_user
@@ -64,6 +66,7 @@ src_install() {
 
 	cd ../.. || die
 	dodoc README*
+
 	newicon bitmaps/pentagram.png "daimonin.png"
 	make_desktop_entry "daimonin" "Daimonin" "daimonin" "Game;Amusement"
 }
diff --git a/games-rpg/daimonin-client/files/daimonin-client-0.10.8-fno-common.patch b/games-rpg/daimonin-client/files/daimonin-client-0.10.8-fno-common.patch
new file mode 100644
index 000000000000..d4369e5f3fbe
--- /dev/null
+++ b/games-rpg/daimonin-client/files/daimonin-client-0.10.8-fno-common.patch
@@ -0,0 +1,128 @@
+--- a/dialog.c
++++ b/dialog.c
+@@ -581,7 +581,7 @@
+ /******************************************************************
+  draws all options for the actual page.
+ ******************************************************************/
+-inline void optwin_draw_options(int x, int y)
++void optwin_draw_options(int x, int y)
+ {
+ #define LEN_NAME  111
+     int i = -1, pos = 0, max = 0;
+--- a/include/main.h
++++ b/include/main.h
+@@ -118,7 +118,7 @@
+ }
+ _bmaptype_table;
+ 
+-_bmaptype_table bmaptype_table[BMAPTABLE];
++extern _bmaptype_table bmaptype_table[BMAPTABLE];
+ 
+ extern int              bmaptype_table_size;
+ 
+@@ -306,7 +306,7 @@
+     double killhour;
+ } _statometer;
+ 
+-struct statometer statometer;
++extern struct statometer statometer;
+ 
+ extern time_t sleeptime;
+ 
+--- a/include/map.h
++++ b/include/map.h
+@@ -70,7 +70,7 @@
+ }
+ _mapdata;
+ 
+-struct MapCell
++typedef struct MapCell
+ {
+     short   faces[MAXFACES];
+     short   pos[MAXFACES];
+@@ -85,7 +85,7 @@
+ }
+ MapCell;
+ 
+-struct Map
++typedef struct Map
+ {
+     struct MapCell  cells[MAP_MAX_SIZE][MAP_MAX_SIZE];
+ }
+--- a/include/menu.h
++++ b/include/menu.h
+@@ -41,15 +41,15 @@
+ #define MENU_ALL (MENU_NO & MENU_KEYBIND & MENU_SPELL & MENU_STATUS & MENU_OPTION & MENU_NPC & MENU_BOOK & MENU_QUEST)
+ 
+ #define MENU_SOUND_VOL 40
+-struct _skill_list      skill_list[SKILL_LIST_MAX];
++extern struct _skill_list      skill_list[SKILL_LIST_MAX];
+ extern _dialog_list_set skill_list_set;
+ 
+-struct _spell_list      spell_list[SPELL_LIST_MAX]; /* skill list entries */
++extern struct _spell_list      spell_list[SPELL_LIST_MAX]; /* skill list entries */
+ extern _dialog_list_set spell_list_set;
+ 
+ extern _dialog_list_set option_list_set;
+ 
+-struct _bindkey_list    bindkey_list[BINDKEY_LIST_MAX];
++extern struct _bindkey_list    bindkey_list[BINDKEY_LIST_MAX];
+ extern _dialog_list_set bindkey_list_set;
+ 
+ extern _dialog_list_set create_list_set;
+--- a/include/wrapper.h
++++ b/include/wrapper.h
+@@ -118,7 +118,7 @@
+ extern int      parse_metaserver_data(char *info);
+ 
+ #if defined( __WIN_32)  || defined(__LINUX)
+-	FILE *msglog;
++	extern FILE *msglog;
+ #endif
+ 
+ #if defined(HAVE_STRNICMP)
+--- a/main.c
++++ b/main.c
+@@ -24,6 +24,10 @@
+ #include <include.h>
+ #include <signal.h>
+ 
++_bmaptype_table bmaptype_table[BMAPTABLE];
++
++struct statometer statometer;
++
+ Account             account; /* account data of this player, received from the server */
+ 
+ _server_char       *first_server_char   = NULL; /* list of possible chars/race with setup when we want create a char */
+@@ -33,7 +37,7 @@
+ SDL_Surface        *ScreenSurfaceMap; /* THE map surface (backbuffer)*/
+ SDL_Surface        *zoomed = NULL;
+ struct sockaddr_in  insock; /* Server's attributes */
+-ClientSocket        csocket;
++extern ClientSocket        csocket;
+ int                 SocketStatusErrorNr;        /* if an socket error, this is it */
+ 
+ _login_step          LoginInputStep;
+--- a/menu.c
++++ b/menu.c
+@@ -29,6 +29,7 @@
+ 
+ struct _spell_list      spell_list[SPELL_LIST_MAX]; /* skill list entries */
+ struct _skill_list      skill_list[SKILL_LIST_MAX]; /* skill list entries */
++struct _bindkey_list    bindkey_list[BINDKEY_LIST_MAX];
+ 
+ struct _dialog_list_set spell_list_set;
+ struct _dialog_list_set skill_list_set;
+--- a/wrapper.c
++++ b/wrapper.c
+@@ -22,6 +22,10 @@
+ */
+ #include <include.h>
+ 
++#if defined( __WIN_32)  || defined(__LINUX)
++    FILE *msglog;
++#endif
++
+ /* This is because PHYSFS_isInit() was introduced in 2.0.0 and some linux
+  * distros are still stuck in 1.x.x. So in time we can dump this global and
+  * use PHYSFS_isInit(). But for now, it's a simple query we can reproduce