gentoo resync : 25.11.2020

13 files changed, 595 insertions, 241 deletions

diff --git a/games-sports/Manifest.gz b/games-sports/Manifest.gz
index bfedce3daf13..27f0457b8638 100644
--- a/games-sports/Manifest.gz
+++ b/games-sports/Manifest.gz
diff --git a/games-sports/bygfoot/Manifest b/games-sports/bygfoot/Manifest
index 5e1b320d0d5c..bc31ebe1b45d 100644
--- a/games-sports/bygfoot/Manifest
+++ b/games-sports/bygfoot/Manifest
@@ -1,3 +1,5 @@
+AUX bygfoot-2.3.2-Makefile.patch 2061 BLAKE2B fc47b5e35077a46beedaf46022915226ff7706a84ccc134a78ea07a22d12c01b5ee674cf10441494f453b45ef82ddf41760ec14f2729083ded6334bca39f80f2 SHA512 a6f700f762ba2f2b84ad3689bbd3d9bd56f4dc3ae020588fa0f84c47330c6b4abe8e7bc00f90529c765f418072b1cd5622d9c75c337cc61c1f057f9666d6c490
+AUX bygfoot-2.3.2-fno-common.patch 11308 BLAKE2B 4df50e3ab2bcdcea2566bdc15f566ca46d71766c618b29f1b6f630326a2f0e3f30dbaaffe29d4e3cfe1effe05a2dba73e7e394e63da225f2d31dcfe22842c55d SHA512 91861f6cbb48c9a12c7783150f1ccc035bbc027d3cc33386d260d8ae379ca86000793453358040c0ec2958a4af212233c2ea27cb2128cd3bcedfb83bf9b1c486
 DIST bygfoot-2.3.2.tar.bz2 1585550 BLAKE2B c0c874209c4e7d5a291380857bf020542a427ffbac8bdcbda23dd1c33e3087a40aecdb210c96b630ddfbb388c650d6eb939ed83c6d0141b64c68c01f6916553e SHA512 ce93333f50de6696538a494794d469d6768b93332f8cca1c96725259d23a78f64b94fcfff1e6227ddce52e75ae2d1e55ed78f2e94603bf1c06c6fc808f0b9626
-EBUILD bygfoot-2.3.2-r1.ebuild 957 BLAKE2B ea32c4efef6b6fe66fcad731e72d9cae95e20eb995f95cfbcb273c26968a375f21e8c216c0a545926881b1b90e1de48b0da2121d65d82ae48e7c0faba4a56b66 SHA512 c0b7a5a977ead40f99e8064b203649e838222843e001a26b76a5bb4dac57bf0fe0cc1d94e0609fdbcf5c874baa4095c330d776c0b1d2e2936c01a7e253aee77a
+EBUILD bygfoot-2.3.2-r1.ebuild 765 BLAKE2B cf79e870037a56dc8f01c59a0264bc9921a87d3ce87633f7cd52471ecd75e656ef80b4f497895e9acd56c7460f9e9e1a1fac32e4cec1c5755d1ab49ca69cd644 SHA512 6bb0956c63c2f346d73ce3a93e6ae1e8f0b64c30fa2e12d79ab8d03c99fb7ea2105839d7a5f530f488b0c4202741408f0e1b33cc0390e646b250fb5eb7b46f28
 MISC metadata.xml 330 BLAKE2B a5f84d7f11f3c81bd543e66046fd4fbb6efa723f094ec15747fab5d0430b4b16397a5fac9e9e73f72abfcd718494a5516e27ac1d69d4ea53b4e5074bcc0c4578 SHA512 ab2de414d15e699ff5c054e0684847b55bc8a30915652b69b02a7b38f2da2cc960b5b92ca8da199a2fdb3187e5d47d0472be5c85012bf76925b79bc01e20575d
diff --git a/games-sports/bygfoot/bygfoot-2.3.2-r1.ebuild b/games-sports/bygfoot/bygfoot-2.3.2-r1.ebuild
index 9ed990aea67c..6a48c7824293 100644
--- a/games-sports/bygfoot/bygfoot-2.3.2-r1.ebuild
+++ b/games-sports/bygfoot/bygfoot-2.3.2-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils vcs-clean
+inherit desktop vcs-clean
 
 DESCRIPTION="GTK+2 Soccer Management Game"
 HOMEPAGE="http://bygfoot.sourceforge.net/"
@@ -12,35 +12,32 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="
 	app-arch/zip
 	media-libs/freetype:2
 	x11-libs/gtk+:2
 	virtual/libintl"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	sys-devel/gettext
 	virtual/pkgconfig"
 
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's:$(gnulocaledir):/usr/share/locale:' \
-		-e '/PACKAGE_LOCALE_DIR/s:\$(prefix)/\$(DATADIRNAME):/usr/share:' \
-		-e '/bygfoot_LDADD/s/$/ -lm/' \
-		po/Makefile.in.in src/Makefile.in || die
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-Makefile.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
 
 src_configure() {
 	econf --disable-gstreamer
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	default
+	dodoc UPDATE
+
 	esvn_clean "${D}"
-	dodoc AUTHORS ChangeLog README TODO UPDATE
+
 	newicon support_files/pixmaps/bygfoot_icon.png ${PN}.png
 	make_desktop_entry ${PN} Bygfoot
 }
diff --git a/games-sports/bygfoot/files/bygfoot-2.3.2-Makefile.patch b/games-sports/bygfoot/files/bygfoot-2.3.2-Makefile.patch
new file mode 100644
index 000000000000..306428a50055
--- /dev/null
+++ b/games-sports/bygfoot/files/bygfoot-2.3.2-Makefile.patch
@@ -0,0 +1,57 @@
+--- a/po/Makefile.in.in
++++ b/po/Makefile.in.in
+@@ -28,7 +28,7 @@
+ datarootdir = @datarootdir@
+ datadir = @datadir@
+ libdir = @libdir@
+-localedir = $(libdir)/locale
++localedir = @localedir@
+ gnulocaledir = $(datadir)/locale
+ gettextsrcdir = $(datadir)/glib-2.0/gettext/po
+ subdir = po
+@@ -129,7 +129,6 @@
+ 	for cat in $$catalogs; do \
+ 	  cat=`basename $$cat`; \
+ 	  case "$$cat" in \
+-	    *.gmo) destdir=$(gnulocaledir);; \
+ 	    *)     destdir=$(localedir);; \
+ 	  esac; \
+ 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+@@ -183,8 +182,6 @@
+ 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+ 	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
+ 	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
+-	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
+-	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
+ 	done
+ 	if test "$(PACKAGE)" = "glib"; then \
+ 	  rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -206,7 +206,7 @@
+ AM_CFLAGS = -Wall #-fprofile-arcs -ftest-coverage -pg
+ INCLUDES = \
+ 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
+-	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
++	-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
+ 	@PACKAGE_CFLAGS@ @GST_CFLAGS@
+ 
+ bygfoot_SOURCES = \
+@@ -289,7 +289,7 @@
+ 	xml_team.c file.h free.h main.h misc.h option.h player.h team.h variables.h xml_team.h \
+ 	youth_academy.c free.h maths.h name.h option.h player.h team.h user.h youth_academy.h 
+ 
+-bygfoot_LDADD = @PACKAGE_LIBS@ @GST_LIBS@ $(INTLLIBS) 
++bygfoot_LDADD = @PACKAGE_LIBS@ @GST_LIBS@ $(INTLLIBS) -lm
+ all: all-am
+ 
+ .SUFFIXES:
+@@ -348,7 +348,7 @@
+ 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+ bygfoot$(EXEEXT): $(bygfoot_OBJECTS) $(bygfoot_DEPENDENCIES) 
+ 	@rm -f bygfoot$(EXEEXT)
+-	$(LINK) $(bygfoot_OBJECTS) $(bygfoot_LDADD) $(LIBS)
++	$(LINK) $(bygfoot_OBJECTS) $(bygfoot_LDADD) $(LIBS) -lm
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
diff --git a/games-sports/bygfoot/files/bygfoot-2.3.2-fno-common.patch b/games-sports/bygfoot/files/bygfoot-2.3.2-fno-common.patch
new file mode 100644
index 000000000000..931b7a01f7f9
--- /dev/null
+++ b/games-sports/bygfoot/files/bygfoot-2.3.2-fno-common.patch
@@ -0,0 +1,496 @@
+--- a/src/main.c
++++ b/src/main.c
+@@ -61,6 +61,42 @@
+ #include "window.h"
+ #include "xml_strategy.h"
+ 
++// Global vars (-fno-common)
++Country country;
++GArray *users;
++gint season, week, week_round;
++OptionList options;
++OptionList constants;
++OptionList constants_app;
++OptionList settings;
++OptionList tokens;
++GArray *lg_commentary[LIVE_GAME_EVENT_END];
++GArray *news[NEWS_ARTICLE_TYPE_END];
++NewsPaper newspaper;
++GArray *transfer_list;
++GArray *season_stats;
++GArray *strategies;
++GArray *bets[2];
++gfloat current_interest;
++GArray *jobs, *job_teams;
++gint counters[COUNT_END];
++gint status[6];
++gpointer statp;
++gint selected_row;
++GArray *name_lists;
++Windows window;
++GArray *live_games;
++gint cur_user;
++gint timeout_id;
++GRand *rand_generator;
++gint debug_level, debug_output;
++GList *support_directories;
++GList *root_definitions_directories;
++GList *definitions_directories;
++gchar *save_file;
++gboolean os_is_unix;
++OptionList hints;
++
+ #define DEBUG_LEVEL_DEFAULT 0
+ 
+ #if defined(MAC_BUILD) || defined(G_OS_WIN32)
+--- a/src/variables.h
++++ b/src/variables.h
+@@ -33,89 +33,89 @@
+  * The main variable of the game.
+  * @see Country
+  */
+-Country country;
++extern Country country;
+ 
+ /** The array of human players. @see #User */
+-GArray *users;
++extern GArray *users;
+ 
+ /** The season, week and week round numbers. 
+     We keep track of the time in the game with these variables. */
+-gint season, week, week_round;
++extern gint season, week, week_round;
+ 
+ /** Array of options that get read from
+     bygfoot.conf. */
+-OptionList options;
++extern OptionList options;
+ /** Array of constants that get read from the constants
+     file specified in bygfoot.conf. */
+-OptionList constants;
++extern OptionList constants;
+ /** Array of constants affecting game appearance rather than
+     behaviour. */
+-OptionList constants_app;
++extern OptionList constants_app;
+ /** Array with internal settings. */
+-OptionList settings;
++extern OptionList settings;
+ /* Array holding string replacement tokens. */
+-OptionList tokens;
++extern OptionList tokens;
+ 
+ /** The array containing the live game commentary strings. */
+-GArray *lg_commentary[LIVE_GAME_EVENT_END];
++extern GArray *lg_commentary[LIVE_GAME_EVENT_END];
+ 
+ /** The array containing the news article strings. */
+-GArray *news[NEWS_ARTICLE_TYPE_END];
++extern GArray *news[NEWS_ARTICLE_TYPE_END];
+ 
+ /** Newspaper containing the news articles. */
+-NewsPaper newspaper;
++extern NewsPaper newspaper;
+ 
+ /** The array containing players to be transfered.
+     @see TransferPlayer */
+-GArray *transfer_list;
++extern GArray *transfer_list;
+ 
+ /** Array with season statistics (updated at the
+     end of each season. */
+-GArray *season_stats;
++extern GArray *season_stats;
+ 
+ /** Array of available CPU strategies. */
+-GArray *strategies;
++extern GArray *strategies;
+ 
+ /** Array of current and recent bets. */
+-GArray *bets[2];
++extern GArray *bets[2];
+ 
+ /** Loan interest for the current week. */
+-gfloat current_interest;
++extern gfloat current_interest;
+ 
+ /** Array of jobs in the job exchange and
+     teams going with the international jobs. */
+-GArray *jobs, *job_teams;
++extern GArray *jobs, *job_teams;
+ 
+ /** Some counters we use. */
+-gint counters[COUNT_END];
++extern gint counters[COUNT_END];
+ 
+ /** These help us keep track of what's happening. */
+-gint status[6];
++extern gint status[6];
+ 
+ /** A pointer we store temporary stuff in. */
+-gpointer statp;
++extern gpointer statp;
+ 
+ /** The currently selected row in the treeview. */
+-gint selected_row;
++extern gint selected_row;
+ 
+ /** An array of name lists. */
+-GArray *name_lists;
++extern GArray *name_lists;
+ 
+ /** The struct containing the window pointers. */
+-Windows window;
++extern Windows window;
+ 
+ /** The variables for non-user live games (which aren't shown). */
+-GArray *live_games;
++extern GArray *live_games;
+ 
+ /** The index of the current user in the #users array. */
+-gint cur_user;
++extern gint cur_user;
+ 
+-gint timeout_id;
++extern gint timeout_id;
+ 
+-GRand *rand_generator;
++extern GRand *rand_generator;
+ 
+ /** Debug information. */
+-gint debug_level, debug_output;
++extern gint debug_level, debug_output;
+ 
+ /**
+    The list of directories the file_find_support_file() function
+@@ -123,24 +123,24 @@
+    @see file_find_support_file()
+    @see file_add_support_directory_recursive()
+ */
+-GList *support_directories;
++extern GList *support_directories;
+ 
+ /**
+  * The list of root defintions directories found (ending in definitions)
+  */ 
+-GList *root_definitions_directories;
++extern GList *root_definitions_directories;
+ 
+ /**
+  * The list of defintions directories found
+  */ 
+-GList *definitions_directories;
++extern GList *definitions_directories;
+ 
+ /** The name of the current save file (gets updated when a game is
+     saved or loaded).  */
+-gchar *save_file;
++extern gchar *save_file;
+ 
+ /** Whether we are using a Unix system or Windows. */
+-gboolean os_is_unix;
++extern gboolean os_is_unix;
+ 
+ /** The hints displayed in the splash screen. */
+-OptionList hints;
++extern OptionList hints;
+--- a/src/xml_country.c
++++ b/src/xml_country.c
+@@ -65,7 +65,7 @@
+ /**
+  * The state variable used in the XML parsing functions.
+  */
+-gint state;
++extern gint state;
+ Country *cntry;
+ 
+ /**
+--- a/src/xml_cup.c
++++ b/src/xml_cup.c
+@@ -129,7 +129,7 @@
+ /**
+  * The state variable used in the XML parsing functions.
+  */
+-gint state;
++extern gint state;
+ 
+ /** The variable we will fill and append to an array. */
+ Cup new_cup;
+--- a/src/xml_league.c
++++ b/src/xml_league.c
+@@ -123,7 +123,7 @@
+ /**
+  * The state variable used in the XML parsing functions.
+  */
+-gint state;
++extern gint state;
+ 
+ /** The new league we create and append to an array. */
+ League new_league;
+--- a/src/xml_lg_commentary.c
++++ b/src/xml_lg_commentary.c
+@@ -80,7 +80,8 @@
+     STATE_END
+ };
+ 
+-gint state, commentary_idx, priority;
++extern gint state;
++gint commentary_idx, priority;
+ gchar *condition;
+ 
+ /** Return the appropriate enum integer going with the event string. */
+--- a/src/xml_loadsave_cup.c
++++ b/src/xml_loadsave_cup.c
+@@ -80,13 +80,13 @@
+     TAG_END
+ };
+ 
+-gint state;
+-Cup *new_cup;
+-CupChooseTeam new_choose_team;
+-CupRound new_round;
+-gchar *dirname;
+-WeekBreak new_week_break;
+-CupRoundWait new_wait;
++extern gint state;
++extern Cup *new_cup;
++extern CupChooseTeam new_choose_team;
++extern CupRound new_round;
++extern gchar *dirname;
++extern WeekBreak new_week_break;
++extern CupRoundWait new_wait;
+ 
+ void
+ xml_loadsave_cup_start_element (GMarkupParseContext *context,
+--- a/src/xml_loadsave_fixtures.c
++++ b/src/xml_loadsave_fixtures.c
+@@ -47,7 +47,8 @@
+     TAG_END
+ };
+ 
+-gint state, residx1, residx2, teamidx, nameidx;
++extern gint state;
++gint residx1, residx2, teamidx, nameidx;
+ Fixture new_fixture;
+ GArray *fixtures_array;
+ 
+--- a/src/xml_loadsave_jobs.c
++++ b/src/xml_loadsave_jobs.c
+@@ -48,7 +48,7 @@
+     TAG_END
+ };
+ 
+-gint state;
++extern gint state;
+ Job new_job;
+ 
+ void
+--- a/src/xml_loadsave_league.c
++++ b/src/xml_loadsave_league.c
+@@ -67,12 +67,13 @@
+     TAG_END
+ };
+ 
+-gint promrankidx, state;
++gint promrankidx;
++extern gint state;
+ PromRelElement new_element;
+ PromGames new_prom_games;
+-WeekBreak new_week_break;
+-League *new_league;
+-gchar *dirname;
++extern WeekBreak new_week_break;
++extern League *new_league;
++extern gchar *dirname;
+ 
+ void
+ xml_loadsave_league_start_element (GMarkupParseContext *context,
+--- a/src/xml_loadsave_leagues_cups.c
++++ b/src/xml_loadsave_leagues_cups.c
+@@ -44,7 +44,7 @@
+     TAG_END
+ };
+ 
+-gint state;
++extern gint state;
+ const gchar *dir;
+ 
+ void
+--- a/src/xml_loadsave_league_stat.c
++++ b/src/xml_loadsave_league_stat.c
+@@ -46,7 +46,8 @@
+     TAG_END
+ };
+ 
+-gint state, in_state, valueidx;
++extern gint state;
++gint in_state, valueidx;
+ Stat new_stat;
+ LeagueStat *lig_stat;
+ 
+--- a/src/xml_loadsave_live_game.c
++++ b/src/xml_loadsave_live_game.c
+@@ -63,7 +63,8 @@
+     TAG_END
+ };
+ 
+-gint state, unitidx,
++extern gint state;
++gint unitidx,
+     statvalidx, statvalidx2, statplidx, statplidx2,
+     team_name_idx;
+ LiveGameUnit new_unit;
+--- a/src/xml_loadsave_misc.c
++++ b/src/xml_loadsave_misc.c
+@@ -53,8 +53,9 @@
+     TAG_END
+ };
+ 
+-gint state, countidx, oddidx, betidx;
+-BetMatch new_bet;
++extern gint state;
++gint countidx, oddidx, betidx;
++extern BetMatch new_bet;
+ 
+ void
+ xml_loadsave_misc_start_element (GMarkupParseContext *context,
+--- a/src/xml_loadsave_newspaper.c
++++ b/src/xml_loadsave_newspaper.c
+@@ -49,8 +49,8 @@
+     TAG_END
+ };
+ 
+-gint state;
+-NewsPaperArticle new_article;
++extern gint state;
++extern NewsPaperArticle new_article;
+ 
+ void
+ xml_loadsave_newspaper_start_element (GMarkupParseContext *context,
+--- a/src/xml_loadsave_players.c
++++ b/src/xml_loadsave_players.c
+@@ -69,8 +69,9 @@
+     TAG_END
+ };
+ 
+-gint state, etalidx, careeridx;
+-Player new_player;
++extern gint state;
++gint etalidx, careeridx;
++extern Player new_player;
+ PlayerGamesGoals new_games_goals;
+ PlayerCard new_card;
+ 
+--- a/src/xml_loadsave_season_stats.c
++++ b/src/xml_loadsave_season_stats.c
+@@ -46,7 +46,7 @@
+     TAG_END
+ };
+ 
+-gint state, in_state;
++extern gint state, in_state;
+ ChampStat new_champ_stat;
+ SeasonStat new_season_stat;
+ const gchar *dirname2;
+--- a/src/xml_loadsave_table.c
++++ b/src/xml_loadsave_table.c
+@@ -38,8 +38,8 @@
+     TAG_END
+ };
+ 
+-gint state, valueidx;
+-TableElement new_element;
++extern gint state, valueidx;
++extern TableElement new_element;
+ Table *new_table;
+ 
+ void
+--- a/src/xml_loadsave_teams.c
++++ b/src/xml_loadsave_teams.c
+@@ -53,12 +53,9 @@
+     TAG_END
+ };
+ 
+-gint state, etalidx, careeridx;
++extern gint state;
+ GArray *teams_array;
+ Team new_team;
+-Player new_player;
+-PlayerGamesGoals new_games_goals;
+-PlayerCard new_card;
+ 
+ void
+ xml_loadsave_teams_start_element (GMarkupParseContext *context,
+--- a/src/xml_loadsave_transfers.c
++++ b/src/xml_loadsave_transfers.c
+@@ -46,7 +46,8 @@
+     TAG_END
+ };
+ 
+-gint state, feeidx, wageidx;
++extern gint state;
++gint feeidx, wageidx;
+ Transfer new_transfer;
+ TransferOffer new_offer;
+ 
+--- a/src/xml_loadsave_users.c
++++ b/src/xml_loadsave_users.c
+@@ -79,7 +79,8 @@
+     TAG_END
+ };
+ 
+-gint state, idx_mon_in, idx_mon_out, idx,
++extern gint state;
++gint idx_mon_in, idx_mon_out, idx,
+     idx_bet, idx_cnt;
+ User new_user;
+ UserHistory new_history;
+--- a/src/xml_mmatches.c
++++ b/src/xml_mmatches.c
+@@ -47,7 +47,7 @@
+ /**
+  * The state variable used in the XML parsing functions.
+  */
+-gint state;
++extern gint state;
+ MemMatch new_match;
+ gchar *dirname;
+ GArray *mm_array;
+--- a/src/xml_news.c
++++ b/src/xml_news.c
+@@ -59,8 +59,9 @@
+     STATE_END
+ };
+ 
+-gint state, article_idx, priority;
+-gchar *condition;
++extern gint state, priority;
++gint article_idx;
++extern gchar *condition;
+ NewsArticle new_article;
+ NewsText new_title, new_subtitle;
+ 
+--- a/src/xml_strategy.c
++++ b/src/xml_strategy.c
+@@ -91,7 +91,8 @@
+     STATE_STRATEGY_MATCH_ACTION_SUB_OUT_POS,
+ };
+ 
+-gint state, action_id;
++extern gint state;
++gint action_id;
+ 
+ #define curstrat g_array_index(strategies, Strategy, strategies->len - 1)
+ #define curprematch g_array_index(curstrat.prematch, StrategyPrematch, curstrat.prematch->len - 1)
+--- a/src/xml_team.c
++++ b/src/xml_team.c
+@@ -70,7 +70,8 @@
+     STATE_END
+ };
+ 
+-gint state, birth_year;
++extern gint state;
++gint birth_year;
+ Player new_player;
+ Team *team;
+ const gchar *d_file;
diff --git a/games-sports/gracer/Manifest b/games-sports/gracer/Manifest
index 24f299335bc1..7b2a6ed84177 100644
--- a/games-sports/gracer/Manifest
+++ b/games-sports/gracer/Manifest
@@ -1,5 +1,6 @@
 AUX 0.1.5-gldefs.patch 1066 BLAKE2B 9fe3b38e03a65311d9867d5f68083452112c8000c97a1a130ed4ef176287a2407368374a7c47e3968181cdd7b78718a0e37dd4b9b71c6ba3d9d8fc91ff7135bd SHA512 817bfa44ccdc07366177e1048b47c822313d1509c90c4f7569ec4c6dd423d75053e45e95b52c8986ec23b1300b49be4e8dae3f875c47b168c438996d6fff9e5f
 AUX gracer-0.1.5-as-needed.patch 1134 BLAKE2B 7f1163ceec6c90d3b5d1aa704b75909a74884c44f8be506ae1f71d2a36071da9f32a0928050380043416537683d476a8dfb0509cf4b617d2c7214c43289a0274 SHA512 dc7738a289d8ca9df8548cdf3011e523814ddd8071df0cc73f1ff0a2ce52e679b821608bd91978585f0c3c658e3b9091204ccad58100c190524b6c0326236b85
+AUX gracer-0.1.5-gcc10.patch 284 BLAKE2B 1a7000eba08b7735a576c57971daa915977fc4c5c586351e9b5b9291f4e04856ecd4eb7589d5aa12b7cac1bbbbc04fc485a645ed8e0fa61cc0c0645e65e46c86 SHA512 db5265785e5c76b7e7ee24a1b1a8317f11a03574699ecf11bf3ac16ded1a531fe26bf2d1fb3bb455e0c20558cde17fc4e33c79c9df3dedda2f00321c64fb0ba5
 AUX gracer-0.1.5-gcc41.patch 414 BLAKE2B 2a26e687f8491568849ffde604447cb24d5e60425f47916d1ef0533af6a2d7dd8dbe14bfece2a6a11b89991890f665037ffd8f8f389ba616c5968d0bd779f866 SHA512 b732fcb3f0dc990f32ea55cddc35e44eb57994989a5f3b1c38b1d89a9e4e1e4c77ffa0244c0eb1b5b1259e396a7d8718289a32cf314ae7b8b2738a3ec0acc8ac
 AUX gracer-0.1.5-giflib.patch 331 BLAKE2B a71d7b71fafeea69ac2728bc7b87d7c8af293975d0cc23095cc9c7dc1b233fc28dd3ac02cf625daf5e8d2a42603de1280775553ab0538bb2c07be2d0b2c0c953 SHA512 56ced23de71bdaeb577b5b006fd2f139f70d681584d4de7b96e33e5199f2f3c6e2a31ece79b9c32eb61ffdac1848a504bc8a1ed9f1bad2a90f41bb2fbeb51b57
 AUX gracer-0.1.5-libpng14.patch 389 BLAKE2B 29b82dd813bb53ab2e24d18eb51962d53e07b03dc05c2a8f838a7bf594bd01062f5ad5de2823107adad591758fe24d1a0aecc26eedf4aa24dc09b2aae672c26f SHA512 8074b990613e2c1957e41e7091289291275dcb5aaf54e89553cdcc333cfc0c226d4ae9af71809f847b541280667f26912711d3eb868ae746952b8dccdaf6519f
@@ -7,5 +8,5 @@ AUX gracer-0.1.5-png15.patch 314 BLAKE2B eee2f0362eeb2d8495b1389324c98b79f520a84
 AUX gracer-0.1.5-warnings.patch 433 BLAKE2B 477908392007a988c8d251c5671984fb1115425f902bc06523042fcb7c55657c73e62dfd4fb1b95c2a7b4d2067d5895f0f8c22c0b3b59b1637cbe59255bb49a5 SHA512 a8a1c2ac8b6d38355b48bfb61980f6eee15b0404dd4d8d8a17debe3d69a319f1b9f48aa40e0d00857af8051f1d93d864e6970d2d051791e8e21ffedbb09b2d31
 AUX gracer-gcc-3.4.patch 1755 BLAKE2B 28f5493bad092f9894cda84ff875824ee7d8490a921a74414277f95195949d2b8cdcc1c8d26a0666fb84f767266910c50fe6778fda581baf0045750f0913c44e SHA512 544bb200bb49bf40b798c32f30f24795204c6e3f67a971ad9254f040e7f30a063e17974a6256de54d4550cb347392a4e71fb8aa29fc46f1fbcf92b1cf0ad015c
 DIST gracer-0.1.5.tar.gz 520599 BLAKE2B 1e52fffb3eb609f413e5e8afece0a28ec501f82be0941a8da4ab0bc726f0394b18d676696fe2b02f176c55892f780f9e3786d219c487533d9b4270f43ac8200a SHA512 eb812c517087a955d4b421e5d0e4bc841428162ed3f76dcac1a7a36b67e6ac14e8a6c231cca2a8ba9c60a4a25c79d532983a13dc4e9b9e4b7dfad3e78f1284bc
-EBUILD gracer-0.1.5-r1.ebuild 996 BLAKE2B 7da74c04fd3f6b09bebf9a7684b91ff4939f184b77b1366e154d5e4fa265d88da9bd026a0cc3d587f752767eac56ac9d5f5a6cfc4ba3739e1230350d2e3cb01e SHA512 f7817438fcd36264d1e047161f5ee5fb491d3016530c8864e320563835c5d14ee3d80fe12ed8e575e629f3a0852abe1db9c6a37f9b6430cebed7c89653c02bf1
+EBUILD gracer-0.1.5-r2.ebuild 1033 BLAKE2B 12c7063bed922c2c89d6c7d55bdb7e141ce30c8ac943b7dcda1038002fd906b9f45d3af13d9d92bf55668294344773179e5599435e334ae43a574acf82096409 SHA512 b42593a217c2c31e48b04b7effa94a0f3d15d4f51849244a27b86ce76f52cbbc18233e3ff3a88b14027656a0023d4cc70ea8e6d6c12e2014f46096c27d50556e
 MISC metadata.xml 329 BLAKE2B a18bab81346e7fcc2a257edf21cbc4707bdc2fa2133c2274967dd17e7ae052b327a1fdc116b2f008e9705def4300915b1c42e3f40383abf2627d662f32aee4e3 SHA512 c2f7b825c898da8e7ff14e83350c02a880eb2338607f562c42cd7dabd25ddaa938f4202aff742091302b0e609f02d2c4abf5c3b34e24b29262530934ffd2139d
diff --git a/games-sports/gracer/files/gracer-0.1.5-gcc10.patch b/games-sports/gracer/files/gracer-0.1.5-gcc10.patch
new file mode 100644
index 000000000000..a7539248e50d
--- /dev/null
+++ b/games-sports/gracer/files/gracer-0.1.5-gcc10.patch
@@ -0,0 +1,14 @@
+Fix -fno-common
+
+diff -r c259e312716e vehicle.h
+--- a/src/vehicle.h	Sat Oct 03 12:42:08 2020 +0000
++++ b/src/vehicle.h	Sat Oct 03 12:44:13 2020 +0000
+@@ -70,7 +70,7 @@
+ 
+   /* constants */
+   float mu[128];		/* friction factor */
+-} GrBreak;
++};
+ 
+ struct _GrTireData {
+   GrRef ref;
diff --git a/games-sports/gracer/gracer-0.1.5-r1.ebuild b/games-sports/gracer/gracer-0.1.5-r2.ebuild
index c604168f2c6c..80f3d160674a 100644
--- a/games-sports/gracer/gracer-0.1.5-r1.ebuild
+++ b/games-sports/gracer/gracer-0.1.5-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="3D motor sports simulator"
 HOMEPAGE="http://gracer.sourceforge.net/"
@@ -13,18 +13,19 @@ KEYWORDS="~amd64 ~x86"
 IUSE="joystick"
 
 DEPEND="
-	dev-lang/tcl:0
+	dev-lang/tcl:0=
 	media-libs/freeglut
-	media-libs/giflib
-	media-libs/libpng:0
+	media-libs/giflib:=
+	media-libs/libpng:0=
 	media-libs/plib
-	x11-libs/libXi
-	x11-libs/libXmu
 	virtual/glu
 	virtual/jpeg:0
-	virtual/opengl"
+	virtual/opengl
+	x11-libs/libXi
+	x11-libs/libXmu
+"
 
-RDEPEND=${DEPEND}
+RDEPEND="${DEPEND}"
 
 PATCHES=(
 		"${FILESDIR}"/${PV}-gldefs.patch
@@ -35,6 +36,7 @@ PATCHES=(
 		"${FILESDIR}"/${P}-png15.patch
 		"${FILESDIR}"/${P}-giflib.patch
 		"${FILESDIR}"/${P}-warnings.patch
+		"${FILESDIR}"/${P}-gcc10.patch
 )
 
 src_configure() {
diff --git a/games-sports/vdrift/Manifest b/games-sports/vdrift/Manifest
deleted file mode 100644
index 36c2d970f703..000000000000
--- a/games-sports/vdrift/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX vdrift-20120722-build.patch 1199 BLAKE2B 1731b61cdfb74c83e77e7b1fedd4ca970b6e73cf0223c818a79e35ac7869b89862d460066d6ac7608541dbe9bfe735fcfc29786f657bbbb98348fd3cb122a3f4 SHA512 4a12d2c3120d641668263dd7d8a2fb8b455e7f39ca33fabe85945fe6b7439f54d7cd2cf0b1752c7aae29d0b88c727f84f4e7092d3233bf5532c4db278b0eae39
-AUX vdrift-20120722-bullet.patch 3406 BLAKE2B 048d0f47b360bc63d6fc9d1d250b702ae3d452f46c64119076aa3fbcb3ea89af8d18af58215a1919c989203e5194412f94cd6f79bb37b0bd43d113e1b3029806 SHA512 aab973d586ae876b1f8fd528cdff80f97d5082954e616296604bd334694116fd4ce980698219e8a2c9662f50da9c5daf9ca9cc70ddd2a2f6795f0aa9673c7a71
-DIST vdrift-2012-07-22.tar.bz2 589288618 BLAKE2B ccdd6358f7d753a87eb8d9d0603001ab3ca6f5c8572348c300a75961f58eb624f4cd7df18b6d892554e0f6e96982de5d5d8aca4f59d8db7e95926d772a6d963f SHA512 eb6f243fd28e5fe46e856c37cb528c8ec903bdec91b6aa86681add79a333077a3a8874f694255913ae8492b965884f02057a95a98e37027ff67c082a8ca5527e
-DIST vdrift-2012-07-22c_patch.diff 21689 BLAKE2B de7575df09d434f41a4dd02554dd39f7b6ae13d676ae33c692c7aabc49764c25805efdf5cb89e0b5fb016e02b5e33b93977d588df87ff0923421b57cf2796026 SHA512 7b82ba53f3c19ccd01de9ea64e0b7e15224219c0c614a6505b2a3f552ce78565fdedf7781a198c58606d3e9b94e594dee79097d46687e7d4fc763868204b761d
-EBUILD vdrift-20120722.ebuild 1513 BLAKE2B 1d117dc7bd51f5c117533be62ffc40c7dd3defff50a085db0c9df5f7154b7aba26ab429e86f7d75077e9fb1a4208ae1ea10007dae40cae19fb0b27bab5c1cf41 SHA512 bb4b69538e274d9608fa705e5fa7f4e4add537f41e032275c9ec883a87905769fa6805a6eb0bd2509ea59340ea096f57aff19b56b3dc56b192f5531226e8503b
-MISC metadata.xml 329 BLAKE2B a2a266c4cff85fa8d76897b4b13687aa44b8f119aca3814b2646f62bc887acf6af3b18048006119ed374be304dfb8825c95d08852558545d36e44343cdff37f5 SHA512 c669371ccb3d0aee737982574fa3cbadba74d6e559fede3bfbac99d7f4f8c1e8e632a2659460008938c307b0e52dd66af357a3f65752c88d8735cf036046fcc0
diff --git a/games-sports/vdrift/files/vdrift-20120722-build.patch b/games-sports/vdrift/files/vdrift-20120722-build.patch
deleted file mode 100644
index 16b6fe4c9ba1..000000000000
--- a/games-sports/vdrift/files/vdrift-20120722-build.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- VDrift.orig/SConstruct
-+++ VDrift/SConstruct
-@@ -44,6 +44,7 @@
-         LIBPATH = ['.', '#lib', LOCALBASE + '/lib'],
-         LINKFLAGS = ['-pthread','-lintl'],
-         options = opts)
-+    env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
-     check_headers = ['GL/gl.h', 'GL/glu.h', 'SDL/SDL.h', 'SDL/SDL_image.h', 'SDL/SDL_rotozoom.h', 'vorbis/vorbisfile.h', 'GL/glew.h', 'bullet/btBulletCollisionCommon.h']
-     check_libs = []
-     if 'CC' in os.environ:
-@@ -380,7 +381,7 @@
- if env['release']:
-     # release build, debugging off, optimizations on
-     if (sys.platform != 'freebsd6') and (sys.platform != 'freebsd7') and (sys.platform != 'freebsd8') and (sys.platform != 'freebsd9') and (sys.platform != 'win32') and (sys.platform != 'cygwin'):
--        env.Append(CCFLAGS = ['-O1', '-pipe'])
-+        env.Append(CCFLAGS = ['-pipe'])
- else:
-     # debug build, lots of debugging, no optimizations
-     env.Append(CCFLAGS = ['-g3'])
-@@ -399,7 +400,6 @@
-     env.Append(CCFLAGS = ['-pg'])
-     env.Append(LINKFLAGS = ['-pg'])
-     env.Append(CCFLAGS = ['-g3'])
--    env.Append(CCFLAGS = ['-O1'])
- 
- #------------------------------------#
- # compile-time efficiency assessment #
-
diff --git a/games-sports/vdrift/files/vdrift-20120722-bullet.patch b/games-sports/vdrift/files/vdrift-20120722-bullet.patch
deleted file mode 100644
index 907433417ee6..000000000000
--- a/games-sports/vdrift/files/vdrift-20120722-bullet.patch
+++ /dev/null
@@ -1,100 +0,0 @@
---- src/cardynamics.cpp	Mon Jan 19 23:26:36 1970

-+++ src/cardynamics.cpp	Mon Jan 19 23:26:36 1970

-@@ -1791,23 +1791,29 @@

- 

- bool CARDYNAMICS::WheelContactCallback(

- 	btManifoldPoint& cp,

--	const btCollisionObject* colObj0,

--	int partId0,

-+	const btCollisionObjectWrapper* col0,

-+	int part0,

- 	int index0,

--	const btCollisionObject* colObj1,

--	int partId1,

-+	const btCollisionObjectWrapper* col1,

-+	int part1,

- 	int index1)

- {

--	// cars are fracture bodies, wheel is a cylinder shape

--	const btCollisionShape* shape = colObj0->getCollisionShape();

--	if ((colObj0->getInternalType() & CO_FRACTURE_TYPE) &&

-+#if (BT_BULLET_VERSION < 281)

-+	const btCollisionObject* obj = col0;

-+	const btCollisionShape* shape = obj->getCollisionShape();

-+	const btCollisionShape* rootshape = obj->getRootCollisionShape();

-+#else

-+	const btCollisionObject* obj = col0->getCollisionObject();

-+	const btCollisionShape* shape = col0->getCollisionShape();

-+	const btCollisionShape* rootshape = obj->getCollisionShape();

-+#endif

-+	if ((obj->getInternalType() & CO_FRACTURE_TYPE) &&

- 		(shape->getShapeType() == CYLINDER_SHAPE_PROXYTYPE))

- 	{

--		// is contact within contact patch?

--		const btCompoundShape* car = static_cast<const btCompoundShape*>(colObj0->getRootCollisionShape());

--		const btCylinderShapeX* wheel = static_cast<const btCylinderShapeX*>(shape);

--		btVector3 contactPoint = cp.m_localPointA - car->getChildTransform(cp.m_index0).getOrigin();

--		if (-direction::up.dot(contactPoint) > 0.5 * wheel->getRadius())

-+		const btCompoundShape* carshape = static_cast<const btCompoundShape*>(rootshape);

-+		const btCylinderShapeX* wheelshape = static_cast<const btCylinderShapeX*>(shape);

-+		btVector3 contactPoint = cp.m_localPointA - carshape->getChildTransform(cp.m_index0).getOrigin();

-+		if (-direction::up.dot(contactPoint) > 0.5 * wheelshape->getRadius())

- 		{

- 			// break contact (hack)

- 			cp.m_normalWorldOnB = btVector3(0, 0, 0);

---- src/cardynamics.h	Mon Jan 19 23:26:36 1970

-+++ src/cardynamics.h	Mon Jan 19 23:26:36 1970

-@@ -25,6 +25,12 @@

- class FractureBody;

- class PTree;

- 

-+#if (BT_BULLET_VERSION < 281)

-+#define btCollisionObjectWrapper btCollisionObject

-+#else

-+struct btCollisionObjectWrapper;

-+#endif

-+

- class CARDYNAMICS : public btActionInterface

- {

- friend class PERFORMANCE_TESTING;

-@@ -151,11 +157,11 @@

- 

- 	static bool WheelContactCallback(

- 		btManifoldPoint& cp,

--		const btCollisionObject* colObj0,

--		int partId0,

-+		const btCollisionObjectWrapper* col0,

-+		int part0,

- 		int index0,

--		const btCollisionObject* colObj1,

--		int partId1,

-+		const btCollisionObjectWrapper* col1,

-+		int part1,

- 		int index1);

- 

- protected:

---- src/dynamicsworld.cpp	Mon Jan 19 23:26:36 1970

-+++ src/dynamicsworld.cpp	Mon Jan 19 23:26:36 1970

-@@ -105,7 +105,7 @@

- 	int patch_id = -1;

- 	const BEZIER * b = 0;

- 	const TRACKSURFACE * s = TRACKSURFACE::None();

--	btCollisionObject * c = 0;

-+	const btCollisionObject * c = 0;

- 

- 	MyRayResultCallback ray(origin, p, caster);

- 	rayTest(origin, p, ray);

-@@ -221,6 +221,7 @@

- 

- void DynamicsWorld::fractureCallback()

- {

-+#if (BT_BULLET_VERSION < 281)

- 	m_activeConnections.resize(0);

- 

- 	int numManifolds = getDispatcher()->getNumManifolds();

-@@ -268,4 +269,5 @@

- 		btRigidBody* child = body->updateConnection(con_id);

- 		if (child) addRigidBody(child);

- 	}

-+#endif

- }
\ No newline at end of file
diff --git a/games-sports/vdrift/metadata.xml b/games-sports/vdrift/metadata.xml
deleted file mode 100644
index 873fcd84214e..000000000000
--- a/games-sports/vdrift/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">vdrift</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-sports/vdrift/vdrift-20120722.ebuild b/games-sports/vdrift/vdrift-20120722.ebuild
deleted file mode 100644
index c863bdfbb2ca..000000000000
--- a/games-sports/vdrift/vdrift-20120722.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils scons-utils games
-
-MY_P=${PN}-${PV:0:4}-${PV:4:2}-${PV:6:2}
-DESCRIPTION="A driving simulation made with drift racing in mind"
-HOMEPAGE="http://vdrift.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
-	mirror://sourceforge/${PN}/${MY_P}c_patch.diff"
-
-LICENSE="GPL-3 ZLIB LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-arch/libarchive
-	media-libs/glew
-	media-libs/libsdl[opengl,video]
-	media-libs/sdl-gfx
-	media-libs/sdl-image[png]
-	media-libs/libvorbis
-	net-misc/curl
-	sci-physics/bullet[-double-precision]
-	virtual/opengl
-	virtual/glu"
-DEPEND="${RDEPEND}
-	dev-cpp/asio
-	dev-libs/boost
-	virtual/pkgconfig"
-
-S=${WORKDIR}/VDrift
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-}
-
-src_prepare() {
-	epatch \
-		"${DISTDIR}"/${MY_P}c_patch.diff \
-		"${FILESDIR}"/${P}-build.patch \
-		"${FILESDIR}"/${P}-bullet.patch
-}
-
-src_compile() {
-	escons \
-		force_feedback=1 \
-		destdir="${D}" \
-		bindir="${GAMES_BINDIR}" \
-		datadir="${GAMES_DATADIR}"/${PN} \
-		prefix= \
-		use_binreloc=0 \
-		release=1 \
-		os_cc=1 \
-		os_cxx=1 \
-		os_cxxflags=1 \
-		|| die
-}
-
-src_install() {
-	dogamesbin build/vdrift
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r data/*
-	newicon data/textures/icons/vdrift-64x64.png ${PN}.png
-	make_desktop_entry ${PN} VDrift
-	find "${D}" -name "SCon*" -exec rm \{\} +
-	keepdir "${GAMES_DATADIR}"/${PN}/{music,settings/replays,settings/screenshots}
-	prepgamesdirs
-}