15 files changed, 14 insertions, 473 deletions
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index d5e04290bfc4..be7b9f85494f 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 9322d4f7ebf6..4fe2efb84614 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,10 +1,8 @@
 AUX freeciv-2.5.11-freetype_pkgconfig.patch 8120 BLAKE2B cbcb39010d40abd530b8b30955c0461b7207698bb2e0701469e696d3ad3be6b3b0887d58623c7589784edd6961485517e18877dfbe9c011292e29b94dbcffb94 SHA512 525d3829fa17401cde3a0324d1342d4513decf6996864fa5d02462e2449d0895e8048fa71bd255b028b2ed084f8ca4734536cb86f85dd00d65e14d0f68b41184
-DIST freeciv-2.5.11.tar.bz2 40940090 BLAKE2B dfc1e714e1a3122335f555c2e57352726bda60dc0d1700b0d8ae937c85cba6beb0b2a6ffa6266b77437934ed85f1740f319c379a10c217161ee147f2339a50d3 SHA512 f5eac2fc2b7e09b9fd3b8b45145a5359f8216aef49050c692893d30584000c7db2f2a6e66ac19e67186e2653efaa0aa7656abefe2d2de25d123e9a52ce604456
 DIST freeciv-2.5.12.tar.bz2 40983794 BLAKE2B 53c5f9833684bef20a80c891bb001b2e03c819ba57c0989463b854fda7fe2cffe16d292e8f13f8bf8253aee0691c8ad1cb6f19522c5aae69b48165d26a0c3665 SHA512 bc0de8f2e63779ab0ac57b9a1dfd6ab30b4ad973c9ed1704ae7c1575ec63a695e65016f45abf5ad44b9d3818211aa351b74492783a4155cf19357b7f1dd2554d
-DIST freeciv-2.6.0.tar.bz2 51912466 BLAKE2B 180fa8900af6763ecae9190ce24799a77b8504d98081e48600c16c19e814b2ff1ef01ce6a41cb1a1739f848895e1551ba158f0357602f758e76b9ee6e0104a36 SHA512 658f05ed32a2045eeeadd1e12f88df927378f8032292e709af78f24c2dbc6019ba45ce67e4fe24001a9e70756c68126a313607a81e7009270ad255d7c9fe75d8
 DIST freeciv-2.6.1.tar.bz2 51915573 BLAKE2B 160df7f59a5d2ab8090132df5c690ee96ce6811ad0644341ba07b10000bc2e4c30ef4e60ead57d17a7d0f722e42c204d839264830c7b423ccc393b7e7b30c30b SHA512 44145eaea96d5ab4f18e843102209d0f88a626af37365cf91b5e592bcac45f2692a7e21e9b3454a3ee4b9099212f5826a4687931bb37dabbb7dedad059df1cb4
-EBUILD freeciv-2.5.11-r1.ebuild 4602 BLAKE2B 36c3807a3c0a333af22ef7d39166d4f839d759daeab1bbd433991d28948c620f21017a0aa7d66d3515b898f1fdf0b7f96a3ff7e5add04d87857115ebc0051b8c SHA512 868aec45dc3426aaa7ca6c0957bf108c5ff0b2716f443a9b4108247f58b9564bffe3ee107f6c286f09f1f7d51880f2363d167cc356842d888b822f10d674e5bd
+DIST freeciv-2.6.2.tar.bz2 52139007 BLAKE2B 5d30274f24786dcd0b29d4d85a45be47e791aedba7fbeeb28001e2c19d2acc1fa16b4ab88b779d0dbd318806e571a26c94f8a61b33c6d8df8e68d4fd90713302 SHA512 b11752f38027fcc8b092f323d4e76cf3c4c426bfcc811eb3a76daca075dc391d8179cd140abf1534abc56409344c53238b9fee2ee10d08a688e15671f3a70ef3
 EBUILD freeciv-2.5.12.ebuild 4536 BLAKE2B 2673bcafd06b9c720d3aa62c57f281028ee5b796fa63535bf1ccfd90acaac744fd74c3cd14ce470f8b18f9920a09a7d33b54eb194a41e90af611d7ff3ba39712 SHA512 a6fdaa207990d2fd5521d627a54d24fd2fa62fbe42578e8176f35c598fb2a4149b8ab728f6ac516a63ce3b4923912a54096c87c65f5035a6b1e221e579a8e600
-EBUILD freeciv-2.6.0-r1.ebuild 4655 BLAKE2B 56b8dbca0b4e7409498fb8ca25d6b44633fb7aec98003a7343c3f91aaa349c6e92c1ffeb9913edaab6554f8a2871f1a1f1d910e033f41598dea3cbd6e5f45708 SHA512 304f1bd699e1e76e580aa46f5bdf37b7aee36d4fdef067e706c06883f7275832ff1750bed4b74bb4f9e9600a72149e5e26344441c289579957aac620f87ebc64
 EBUILD freeciv-2.6.1.ebuild 4655 BLAKE2B 56b8dbca0b4e7409498fb8ca25d6b44633fb7aec98003a7343c3f91aaa349c6e92c1ffeb9913edaab6554f8a2871f1a1f1d910e033f41598dea3cbd6e5f45708 SHA512 304f1bd699e1e76e580aa46f5bdf37b7aee36d4fdef067e706c06883f7275832ff1750bed4b74bb4f9e9600a72149e5e26344441c289579957aac620f87ebc64
+EBUILD freeciv-2.6.2.ebuild 4743 BLAKE2B a2c22a679a1f38f4cb4014be58c91498e03d13d18caf3a3b00d8ff6cd6f82dbb735cd90c52ad8fa9e7931cef724e58b96b14230337d4f6199e3f59b4aa3dc121 SHA512 10f48189feb3bb70e78e1962f5106a3f63b157526f29a31c0980c9d0f07569179a05a2904dbdc08d085abe64edae1c08fb8b5742b2f427de41351b426be76fae
 MISC metadata.xml 1031 BLAKE2B 1421e4d2e504fbddc337b16cf2dc51af61957e954dc7c1752f537fd90ff1e3869b82c44635887dcd237eac274a5ca8b0d8c2b1cf92dd348a3301c804dd64142d SHA512 cbf6f0e418650f16f4b517895e6e03a9ffb3bdcd66563fab4ec067e6d4df79a1fb13d0cb9b7b314ad274839b430176405a3760e06a7d1f603f3464d1ff2bb201
diff --git a/games-strategy/freeciv/freeciv-2.5.11-r1.ebuild b/games-strategy/freeciv/freeciv-2.5.11-r1.ebuild
deleted file mode 100644
index 6428dc820641..000000000000
--- a/games-strategy/freeciv/freeciv-2.5.11-r1.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils flag-o-matic gnome2-utils ltprune
-
-DESCRIPTION="multiplayer strategy game (Civilization Clone)"
-HOMEPAGE="http://www.freeciv.org/"
-SRC_URI="mirror://sourceforge/freeciv/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline sdl +server +sound sqlite system-lua"
-
-# postgres isn't yet really supported by upstream
-RDEPEND="app-arch/bzip2
-	app-arch/xz-utils
-	net-misc/curl
-	sys-libs/zlib
-	auth? (
-		mysql? ( dev-db/mysql-connector-c:0= )
-		sqlite? ( dev-db/sqlite:3 )
-		!mysql? ( ( !sqlite? ( dev-db/mysql-connector-c:0= ) ) )
-	)
-	readline? ( sys-libs/readline:0= )
-	dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
-	!dedicated? (
-		media-libs/libpng:0
-		gtk? ( x11-libs/gtk+:2 )
-		mapimg? ( media-gfx/imagemagick:= )
-		modpack? ( x11-libs/gtk+:2 )
-		nls? ( virtual/libintl )
-		qt5? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtwidgets:5
-		)
-		sdl? (
-			media-libs/libsdl[video]
-			media-libs/sdl-gfx
-			media-libs/sdl-image[png]
-			media-libs/sdl-ttf
-		)
-		server? ( aimodules? ( sys-devel/libtool:2 ) )
-		sound? (
-			media-libs/libsdl[sound]
-			media-libs/sdl-mixer[vorbis]
-		)
-		!sdl? ( !gtk? ( x11-libs/gtk+:2 ) )
-	)
-	system-lua? ( >=dev-lang/lua-5.2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	!dedicated? (
-		x11-base/xorg-proto
-		nls? ( sys-devel/gettext )
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.5.11-freetype_pkgconfig.patch"
-)
-
-pkg_setup() {
-	if use !dedicated && use !server ; then
-		ewarn "Disabling server USE flag will make it impossible"
-		ewarn "to start local games, but you will still be able to"
-		ewarn "join multiplayer games."
-	fi
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	# install the .desktop in /usr/share/applications
-	# install the icons in /usr/share/pixmaps
-	sed -i \
-		-e 's:^.*\(desktopfiledir = \).*:\1/usr/share/applications:' \
-		-e 's:^\(icon[0-9]*dir = \)$(prefix)\(.*\):\1/usr\2:' \
-		-e 's:^\(icon[0-9]*dir = \)$(datadir)\(.*\):\1/usr/share\2:' \
-		client/Makefile.in \
-		server/Makefile.in \
-		tools/Makefile.in \
-		data/icons/Makefile.in || die
-	sed -i -e 's/=SDL/=X-SDL/' bootstrap/freeciv-sdl.desktop.in || die
-}
-
-src_configure() {
-	local myclient mydatabase myeconfargs
-
-	if use auth ; then
-		if ! use mysql && ! use sqlite ; then
-			einfo "No database backend chosen, defaulting"
-			einfo "to mysql!"
-			mydatabase=mysql
-		else
-			use mysql && mydatabase+=" mysql"
-			use sqlite && mydatabase+=" sqlite3"
-		fi
-	else
-		mydatabase=no
-	fi
-
-	if use dedicated ; then
-		myclient="no"
-		myeconfargs+=( --enable-server )
-	else
-		if use !sdl && use !gtk && ! use qt5 ; then
-			einfo "No client backend given, defaulting to"
-			einfo "gtk2 client!"
-			myclient="gtk2"
-		else
-			use sdl && myclient+=" sdl"
-			use gtk && myclient+=" gtk2"
-			if use qt5 ; then
-				myclient+=" qt"
-				append-cxxflags -std=c++11
-			fi
-		fi
-		myeconfargs+=( $(use_enable server) --without-ggz-client )
-	fi
-
-	myeconfargs+=(
-		--enable-aimodules="$(usex aimodules "yes" "no")"
-		--enable-client="${myclient}"
-		--enable-fcdb="${mydatabase}"
-		--enable-fcmp="$(usex modpack "gtk2" "no")"
-		# disabling shared libs will break aimodules USE flag
-		--enable-shared
-		--localedir=/usr/share/locale
-		$(use_enable ipv6)
-		$(use_enable mapimg)
-		$(use_enable nls)
-		$(use_enable sound sdl-mixer)
-		$(use_enable system-lua sys-lua)
-		$(use_with readline)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if use dedicated ; then
-		rm -rf "${ED%/}/usr/share/pixmaps"
-		rm -f "${ED%/}"/usr/share/man/man6/freeciv-{client,gtk2,gtk3,modpack,qt,sdl,xaw}*
-	else
-		if use server ; then
-			# Create and install the html manual. It can't be done for dedicated
-			# servers, because the 'freeciv-manual' tool is then not built. Also
-			# delete freeciv-manual from the GAMES_BINDIR, because it's useless.
-			# Note: to have it localized, it should be ran from _postinst, or
-			# something like that, but then it's a PITA to avoid orphan files...
-			./tools/freeciv-manual || die
-			docinto html
-			dodoc manual*.html
-		fi
-		if use sdl ; then
-			make_desktop_entry freeciv-sdl "Freeciv (SDL)" freeciv-client
-		else
-			rm -f "${ED%/}"/usr/share/man/man6/freeciv-sdl*
-		fi
-		rm -f "${ED%/}"/usr/share/man/man6/freeciv-xaw*
-	fi
-	find "${ED}" -name "freeciv-manual*" -delete
-
-	rm -f "${ED%/}/usr/$(get_libdir)"/*.a
-	prune_libtool_files
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-strategy/freeciv/freeciv-2.6.0-r1.ebuild b/games-strategy/freeciv/freeciv-2.6.2.ebuild
index 764443f246c5..e81667668342 100644
--- a/games-strategy/freeciv/freeciv-2.6.0-r1.ebuild
+++ b/games-strategy/freeciv/freeciv-2.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -143,6 +143,7 @@ src_configure() {
 		# disabling shared libs will break aimodules USE flag
 		--enable-shared
 		--localedir=/usr/share/locale
+		--with-appdatadir="${EPREFIX}"/usr/share/metainfo
 		$(use_enable ipv6)
 		$(use_enable mapimg)
 		$(use_enable nls)
@@ -157,8 +158,8 @@ src_install() {
 	default
 
 	if use dedicated ; then
-		rm -rf "${ED}"/usr/share/pixmaps
-		rm -f "${ED}"/usr/share/man/man6/freeciv-{client,gtk2,gtk3,modpack,qt,sdl,xaw}*
+		rm -rf "${ED}"/usr/share/pixmaps || die
+		rm -f "${ED}"/usr/share/man/man6/freeciv-{client,gtk2,gtk3,modpack,qt,sdl,xaw}* || die
 	else
 		if use server ; then
 			# Create and install the html manual. It can't be done for dedicated
@@ -177,8 +178,8 @@ src_install() {
 		fi
 		rm -f "${ED}"/usr/share/man/man6/freeciv-xaw*
 	fi
-	find "${ED}" -name "freeciv-manual*" -delete
+	find "${ED}" -name "freeciv-manual*" -delete || die
 
-	rm -f "${ED}/usr/$(get_libdir)"/*.a
-	find "${ED}" -name "*.la" -delete || die
+	rm -f "${ED}/usr/$(get_libdir)"/*.a || die
+	find "${ED}" -type f -name "*.la" -delete || die
 }
diff --git a/games-strategy/gwp/Manifest b/games-strategy/gwp/Manifest
deleted file mode 100644
index 025bfc6661da..000000000000
--- a/games-strategy/gwp/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX gwp-0.4.0-exec-stack.patch 2842 BLAKE2B 7ab54e843e6b19768f433cae2898e7d9df7380996dc1e2afab8d9d3cf3ce081beef247d12234622e23fe6508aef21f3aecda5f4bc9744be6e9051eabc2aa8751 SHA512 b6845071c5639e4d240742e7470de4723e534814b670e8b98b1971c6e1ae2a64a8d4b8ffaf86ef28bdf3ad6d861dfeee5e2c5e46c43ea955614999fbed46da96
-AUX gwp-0.4.0-gcc41.patch 4100 BLAKE2B 656a9a6b514bd78e61b48a0f43e4230e8164107939c790d599398a0be213383f4f367e9c109cb3935b4a6a150034306f453a72356a2ea408e15e70ffc96ca16b SHA512 0e3acd8978f3a6f1585ad45c2d04c97282daa9173b6d67807d473d79bbc665be4a3471537139e9d710832afeff5e6aa4a3064c3cc36cfe3beba012f330530f31
-DIST gwp-0.4.0.tar.gz 2294453 BLAKE2B 75a688a00b3411c577e6eaae500d15963efb1c96edd82a50863239225fba2d653b52becda8ae71dbe5b88910382d1c64456fc13899e559d3aefefb6bed1e7da5 SHA512 dcb23bb49929bc01129ab5f02b56edb7f775feb0c37bd7613277af8aa0f4b47667f95413725f74a2b83b60159555a50fcabdc8736094aad0684b03cd150b4957
-EBUILD gwp-0.4.0-r4.ebuild 1348 BLAKE2B dcc51746fea6ee4e07e0149f8c9a9af9658e299d259abb883ee03f467d9b8107b0c94d8c640af6a1bc48eb99a2b2c327995adeb3f3bc8271d013245c5c3d0b39 SHA512 4b48d8621ddbdbed4160b6906cd1f91154139f8f7c51396f29719ad0aebcf33038ed9eb2a5f3609411b5cd14666e12356700d813b885d4e7e84fcb24c4444121
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/gwp/files/gwp-0.4.0-exec-stack.patch b/games-strategy/gwp/files/gwp-0.4.0-exec-stack.patch
deleted file mode 100644
index 1458b7ba1dfd..000000000000
--- a/games-strategy/gwp/files/gwp-0.4.0-exec-stack.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- src/starchart.c
-+++ src/starchart.c
-@@ -3187,10 +3187,16 @@
- /**
-  * Initializes starchart constellations.
-  */
-+static GSList *planets;
-+
-+static void add_item (gpointer key, gpointer value, gpointer user_data) {
-+  /*    GSList *p_list = (GSList *)user_data; */
-+  planets = g_slist_append (planets, value);
-+}
-+
- static void 
- init_starchart_constellations (void)
- {
--  GSList *planets = NULL;
-   GSList *ppq[TOTAL_QUADS];
-   GSList *list_nearby = NULL;
-   GwpPlanet *planet_a, *planet_b;
-@@ -3199,10 +3205,6 @@
-   gdouble wx, wy;
-   gdouble ax, ay, bx, by, zoom;
- 
--  static void add_item (gpointer key, gpointer value, gpointer user_data) {
--    /*    GSList *p_list = (GSList *)user_data; */
--    planets = g_slist_append (planets, value);
--  }
- 
-   g_hash_table_foreach (planet_list, (GHFunc)add_item, NULL);
-   
---- src/vcr.c
-+++ src/vcr.c
-@@ -2687,12 +2687,29 @@
-   return( retval );
- }
- 
-+static gchar *name;
-+
-+static void foreach_func( gpointer key, gpointer value, gpointer user_data )
-+{
-+  GwpShip *ship = GWP_SHIP( value );
-+  GtkComboBox *box = GTK_COMBO_BOX( lookup_widget( "vcr_comboboxentry_sel_ext_shp_a" ) );
-+  gint *idlist = (gint *)g_object_get_data(G_OBJECT(lookup_widget("vcr_comboboxentry_sel_ext_shp_a")), "shipidlist");
-+  gint curr = idlist[0];
-+
-+  if( gwp_ship_is_mine( ship ) )
-+  {
-+    curr++;
-+    idlist[curr] = gwp_object_get_id( GWP_OBJECT(ship) );
-+    idlist[0]++;
-+    g_sprintf( name, "%03d: ", idlist[curr] );
-+    strncat( name, gwp_object_get_name (GWP_OBJECT(ship)), 50 );
-+    gtk_combo_box_append_text( box, name );
-+  }
-+}
- 
- void vcr_populate_ship_a_list( GtkWidget *widget, gpointer user_data )
- {
--  gchar *name;
-   gint *idlist;
--  static void foreach_func( gpointer key, gpointer value, gpointer user_data );
- 
-   /* test if list is already populated */
-   idlist = (gint *)g_object_get_data(G_OBJECT(lookup_widget("vcr_comboboxentry_sel_ext_shp_a")), "shipidlist");
-@@ -2708,23 +2725,7 @@
-   GtkWidget *combox = lookup_widget("vcr_comboboxentry_sel_ext_shp_a");
-   g_object_set_data(G_OBJECT(combox), "shipidlist", idlist );
- 
--  void foreach_func( gpointer key, gpointer value, gpointer user_data )
--  {
--    GwpShip *ship = GWP_SHIP( value );
--    GtkComboBox *box = GTK_COMBO_BOX( lookup_widget( "vcr_comboboxentry_sel_ext_shp_a" ) );
--    gint *idlist = (gint *)g_object_get_data(G_OBJECT(lookup_widget("vcr_comboboxentry_sel_ext_shp_a")), "shipidlist");
--    gint curr = idlist[0];
- 
--    if( gwp_ship_is_mine( ship ) )
--    {
--      curr++;
--      idlist[curr] = gwp_object_get_id( GWP_OBJECT(ship) );
--      idlist[0]++;
--      g_sprintf( name, "%03d: ", idlist[curr] );
--      strncat( name, gwp_object_get_name (GWP_OBJECT(ship)), 50 );
--      gtk_combo_box_append_text( box, name );
--    }
--  }
- 
-   g_hash_table_foreach( ship_list, (GHFunc) foreach_func, user_data );
- 
diff --git a/games-strategy/gwp/files/gwp-0.4.0-gcc41.patch b/games-strategy/gwp/files/gwp-0.4.0-gcc41.patch
deleted file mode 100644
index fa7ee5c5443c..000000000000
--- a/games-strategy/gwp/files/gwp-0.4.0-gcc41.patch
+++ /dev/null
@@ -1,107 +0,0 @@
---- src/gwp-game-state.c.old	2006-03-05 00:56:48.000000000 +0900
-+++ src/gwp-game-state.c	2006-03-05 00:57:38.000000000 +0900
-@@ -749,7 +749,7 @@
-   /* Connect to interesting signals */
-   /**********************************/
-   /* Selected planets */
--  static void planet_conn (gpointer key, gpointer value, gpointer self) {
-+  void planet_conn (gpointer key, gpointer value, gpointer self) {
-     g_signal_connect (GWP_PLANET(value),
- 		      "selected",
- 		      G_CALLBACK(selected_planet_notification),
-@@ -757,7 +757,7 @@
-   }
-   g_hash_table_foreach (planet_list, (GHFunc) planet_conn, self);
-   /* Selected ships */
--  static void ship_conn (gpointer key, gpointer value, gpointer self) {
-+  void ship_conn (gpointer key, gpointer value, gpointer self) {
-     g_signal_connect (GWP_SHIP(value),
- 		      "selected",
- 		      G_CALLBACK(selected_ship_notification),
---- src/starchart.c.old	2006-03-05 01:13:39.000000000 +0900
-+++ src/starchart.c	2006-03-05 01:18:04.000000000 +0900
-@@ -2111,7 +2111,7 @@
-   /*******************/
-   /* Planets signals */
-   /*******************/
--  static void planet_conn (gpointer key, gpointer value, gpointer data) {
-+  void planet_conn (gpointer key, gpointer value, gpointer data) {
-     g_signal_connect (GWP_PLANET(value),
- 		      "property-changed",
- 		      G_CALLBACK(update_planet_notification),
---- src/vp_utils.c.old	2006-03-05 01:18:14.000000000 +0900
-+++ src/vp_utils.c	2006-03-05 01:18:52.000000000 +0900
-@@ -2590,7 +2590,7 @@
- 	  gwp_planet_set_colonists (planet, atoi(p_clans));
-       
- 	  /* Compare func */
--	  static gint compare_race (gconstpointer race, gconstpointer adj) {
-+	  gint compare_race (gconstpointer race, gconstpointer adj) {
- 	       gchar *race_str = gwp_race_get_adjective(GWP_RACE(race));
- 	       if (strncmp(race_str, adj, strlen(adj)) == 0) 
- 		    return 0;
-@@ -2639,7 +2639,7 @@
- 	  /* Assign known planet values */
- 	  gwp_planet_set_is_known (planet, TRUE);
- 	  /* Compare func */
--	  static gint compare_race (gconstpointer race, gconstpointer adj) {
-+	  gint compare_race (gconstpointer race, gconstpointer adj) {
- 	       gchar *race_str = gwp_race_get_adjective(GWP_RACE(race));
- 	       if (strncmp(race_str, adj, strlen(adj)) == 0) 
- 		    return 0;
---- src/gwp-py-mappings.c.old	2006-03-05 01:28:39.000000000 +0900
-+++ src/gwp-py-mappings.c	2006-03-05 01:29:30.000000000 +0900
-@@ -8657,7 +8657,7 @@
- {
-   PyObject *ret = PyDict_New();
- 
--  static void add_ship (gpointer key, gpointer value, gpointer user_data) {
-+  void add_ship (gpointer key, gpointer value, gpointer user_data) {
-     PyObject *dict = (PyObject *)user_data;
-     GwpShip *ship = GWP_SHIP(value);
- 
-@@ -8679,7 +8679,7 @@
- {
-   PyObject *ret = PyDict_New();
- 
--  static void add_planet (gpointer key, gpointer value, gpointer user_data) {
-+  void add_planet (gpointer key, gpointer value, gpointer user_data) {
-     PyObject *dict = (PyObject *)user_data;
-     GwpPlanet *planet = GWP_PLANET(value);
- 
-@@ -8701,7 +8701,7 @@
- {
-   PyObject *ret = PyDict_New();
- 
--  static void add_hullspec (gpointer value, gpointer user_data) {
-+  void add_hullspec (gpointer value, gpointer user_data) {
-     PyObject *dict = (PyObject *)user_data;
-     GwpHullSpec *hullspec = GWP_HULLSPEC(value);
- 
-@@ -8723,7 +8723,7 @@
- {
-   PyObject *ret = PyDict_New();
- 
--  static void add_engspec (gpointer value, gpointer user_data) {
-+  void add_engspec (gpointer value, gpointer user_data) {
-     PyObject *dict = (PyObject *)user_data;
-     GwpEngSpec *engspec = GWP_ENGSPEC(value);
- 
-@@ -8745,7 +8745,7 @@
- {
-   PyObject *ret = PyDict_New();
- 
--  static void add_beamspec (gpointer value, gpointer user_data) {
-+  void add_beamspec (gpointer value, gpointer user_data) {
-     PyObject *dict = (PyObject *)user_data;
-     GwpBeamSpec *beamspec = GWP_BEAMSPEC(value);
- 
-@@ -8767,7 +8767,7 @@
- {
-   PyObject *ret = PyDict_New();
- 
--  static void add_torpspec (gpointer value, gpointer user_data) {
-+  void add_torpspec (gpointer value, gpointer user_data) {
-     PyObject *dict = (PyObject *)user_data;
-     GwpTorpSpec *torpspec = GWP_TORPSPEC(value);
- 
diff --git a/games-strategy/gwp/gwp-0.4.0-r4.ebuild b/games-strategy/gwp/gwp-0.4.0-r4.ebuild
deleted file mode 100644
index 86e8f30a76bb..000000000000
--- a/games-strategy/gwp/gwp-0.4.0-r4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GCONF_DEBUG="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils flag-o-matic gnome2 python-single-r1
-
-DESCRIPTION="GNOME client for the classic PBEM strategy game VGA Planets 3"
-HOMEPAGE="http://gwp.lunix.com.ar/"
-SRC_URI="http://gwp.lunix.com.ar/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls opengl python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="x11-libs/gtk+:2
-	gnome-base/libgnomeui
-	gnome-base/libglade
-	app-text/rarian
-	dev-libs/libpcre
-	nls? ( virtual/libintl )
-	opengl? ( x11-libs/gtkglext )
-	python? ( ${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/pygtk[${PYTHON_MULTI_USEDEP}]
-		')
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	append-libs -lm
-	epatch \
-		"${FILESDIR}"/${P}-gcc41.patch \
-		"${FILESDIR}"/${P}-exec-stack.patch
-	sed -i \
-		-e '/ -O1/d' \
-		-e '/ -g$/d' \
-		src/Makefile.in || die
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable nls) \
-		$(use_enable opengl gtkglext) \
-		$(use_enable python)
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog CHANGES README TODO" \
-	gnome2_src_install
-	rm -rf "${D}"/usr/share/doc/gwp
-}
diff --git a/games-strategy/gwp/metadata.xml b/games-strategy/gwp/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-strategy/gwp/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/games-strategy/naev/Manifest b/games-strategy/naev/Manifest
index 86f70c19e617..feae7a099487 100644
--- a/games-strategy/naev/Manifest
+++ b/games-strategy/naev/Manifest
@@ -1,4 +1,4 @@
 DIST naev-0.6.1.tar.bz2 1047908 BLAKE2B 3763440c64f89c5ceb5993a3e4ee356d0cc615df8b70dba14ce0fb35d12a0a136e82958349887d9c5a719e14d9ddfc47beb524b88650ea6f7a6859a6422d6898 SHA512 4766c80b49de5a7e748948f0404ac54edbc5afa80618150d1f993d66c7462ea73bfc5220d73073cb51cd76ff5dc6ecdf935d6f843051943136ceefaea9837203
 DIST ndata-0.6.1.zip 303984255 BLAKE2B 154d8b326e2596cfe16fc646e7d482c07d7015253b6933889d12b93a2ee7e28649b1f3ffcb0c0ed2bfe9d1e3654623cab00113486d05fe6fd1262ce989bf9c25 SHA512 71c3024e1713b094b63cb0de3c70239d61c54142b715e61d5206c5eb3cb8c7a851fc1b388ecf891110dd8bb5c2b3759af71d20f39cb6e629c71b27386a57d7fe
-EBUILD naev-0.6.1-r1.ebuild 1565 BLAKE2B aebb3c6cd694faae485311e8d6c3ce68ffd8babaf40c80c5ae6a905e98dd17306b93e0d6095101f3f5de470980a265b6bdcbd0932ec1ea6401cfbd901ced8fa8 SHA512 653098bafd66c78558c3e5e55b8470b9b887ea2bf066c7fbf7abf49071c5afdf683c96750232c64590dd0f646b1fd61f95908651eb3b05ff3321e0d13dd7e304
+EBUILD naev-0.6.1-r1.ebuild 1531 BLAKE2B b58f34c1cf684d0e18bb215ace1fa3b77a3cf6e65131b1cc8dda0ae04bff1dc0bbda13540502b696ada59da9035ca7c001553078e6088ee1dacd5911d98d07ee SHA512 efad61393d551d265b6980198bb0efdb32132d32255472f9512c0dedc696816338c8926b4dc1795e8dd9131da5c601078e55bb004cf49dec039c81b0529aabff
 MISC metadata.xml 480 BLAKE2B 5769dca136bfc7d26f0b5acb60ee6598d75651b7a58d9899b6da0839180a95bee9d183c229026773ec5641e07637e3dbbfbe4fe6f77b0c466fdf62dfb01fc4cc SHA512 d42e9402581393d47976730560c1850d41e0bdd5d8bf842781222b4621db4c5c55ed5b3a886106d7bc43c3830e38bfef55182478fa7eae8bc6342cd1ec293f62
diff --git a/games-strategy/naev/naev-0.6.1-r1.ebuild b/games-strategy/naev/naev-0.6.1-r1.ebuild
index c8999020f3fe..aaf016935851 100644
--- a/games-strategy/naev/naev-0.6.1-r1.ebuild
+++ b/games-strategy/naev/naev-0.6.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -38,7 +38,6 @@ src_unpack() {
 
 src_configure() {
 	econf \
-		--docdir=/usr/share/doc/${PF} \
 		--enable-lua=shared \
 		$(use_enable debug) \
 		$(use_with openal) \
diff --git a/games-strategy/ufoai/Manifest b/games-strategy/ufoai/Manifest
index 0a2adf1871e8..d5f83c267be8 100644
--- a/games-strategy/ufoai/Manifest
+++ b/games-strategy/ufoai/Manifest
@@ -2,5 +2,5 @@ AUX ufoai-2.5.0_p20180603-install.patch 1097 BLAKE2B b2c1f2761429dafd2ffad037e5a
 AUX ufoai-2.5.0_p20180603-mxml3.patch 913 BLAKE2B e9d731a506bfd04d1e6fcf323c9acfcf3c895cf26dc8de308dcbc2ea62b67c643f1dcf58f8ff6087919887d0c8107ffac513c49bcd72a811238dea60edaf7dc6 SHA512 4197a7d444d1180362535f69a03bac3ab28473b1349b3c1d5daf2b360d0a7c5c00b07b6996274d08d3a52f9322f709478bd2c077c786e9501b596a6471eec74d
 DIST ufoai-2.5-data.tar 1277143040 BLAKE2B 20795ec6ebc976087f28fd0e912190bd9094494cc1b206bcc8e1956dec148cb7ab96f244db22e4836b91c0ecfae794cd206296e898015453d8ad6625d4e4ab32 SHA512 9a7be359c82cd633db657c8619cb488b5d41b9f93cd10bdeffd5896d8a1ba3bb828b5969acd14c2a69abb3f53f18113af4ca19435aea80ded94d8df68b11deec
 DIST ufoai-code-8b4533e85fdc0665889ff285e1521432084ee784.zip 33194032 BLAKE2B caebfe5ca0eaa6376659d4aa69132c29aa4af870135a769af3541bd919164d79ab9dfe8007a40bb95507a443f6f1d968bb85b1befe8b6999f9033a0d74d7a7fb SHA512 825ca6f8ac76a3a60746ac1be4406445dd18bab80372c21c2ddfcf4d999db8549614df41386e94197013bb7b4b342ac6d9be8c969b5e1be79e8ee25cf45719c6
-EBUILD ufoai-2.5.0_p20180603-r1.ebuild 3038 BLAKE2B 453fff7c6a780f4f8e867a970b054531f4f77dc0907f050c29a4ae6b91116f07aef1748bb18d894fdc5aaef0f063f129b844d216eb73ccfa06e64938c89b32a8 SHA512 6cafe36a46b2fbee041a065823c79ba38a6b8233b975dfdfde6f7081bb8d66d5b6d99d181abca8580eae927aa6ed9647dbd4aec5d1f1477488822da273cadba5
+EBUILD ufoai-2.5.0_p20180603-r1.ebuild 3006 BLAKE2B 9471f1f3e402b788ea27976d9665f1e159feb360ffb99af3e1d76f35fa4bed822d8476c8f92225739e64a6766df597127af71236f0ce6bda9a7252f0eb407d0f SHA512 1fc7491fea3235f59235761d580661ccd6d424090b8308398813af9c05b7f68aaea35581f6206645f6017d3e36a477983908e9d303a1302c03ea836703ca4d39
 MISC metadata.xml 471 BLAKE2B 3f3c920159d4a2f10232a3c1242fc98f5dcb9709c603070075c775e9dff2f7e153e5c119a72a2145d54e3408d6e5b23e7d3e71259b49119ec1aa4b66f07f39f8 SHA512 4754d2cc82b09fc3d156697f7b4cff7e1e179b08b46a474c6a5d963cd8cb55782494eae6319ae2c5bd16e57b05f5f250d8cdf1da070123e888ec5ea759c3b437
diff --git a/games-strategy/ufoai/ufoai-2.5.0_p20180603-r1.ebuild b/games-strategy/ufoai/ufoai-2.5.0_p20180603-r1.ebuild
index 81b78a01e04d..dea50098a4cb 100644
--- a/games-strategy/ufoai/ufoai-2.5.0_p20180603-r1.ebuild
+++ b/games-strategy/ufoai/ufoai-2.5.0_p20180603-r1.ebuild
@@ -92,7 +92,6 @@ src_configure() {
 		--datadir="${EPREFIX}${DATADIR}"
 		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN}
 		--localedir="${EPREFIX}"/usr/share/locale
-		--disable-dependency-tracking
 		--disable-paranoid
 		--disable-memory
 		--disable-testall
diff --git a/games-strategy/warzone2100/Manifest b/games-strategy/warzone2100/Manifest
index 6321b6051e1e..13f8ed2d6500 100644
--- a/games-strategy/warzone2100/Manifest
+++ b/games-strategy/warzone2100/Manifest
@@ -2,6 +2,6 @@ DIST warzone2100-3.2.3-qt_compile_fix.patch 680 BLAKE2B 1073ea1619640455326c63dc
 DIST warzone2100-3.2.3.tar.xz 81314060 BLAKE2B 231be8c24d1c0967adb0a76ac9e441c2ea9f835720df9951f74227988473d100b24bccbfe4b5882a36c63a798368ed1a1f871751b6b363d90a82fea48c44ba65 SHA512 4b1bc0a0bb50a8b4726a2762a922ee233b92f9835e38bbab80c159a9cb301df7434a73ba5acfb17404031467c02a9b3480d6a0d44906d70896311b3468141746
 DIST warzone2100-3.3.0_src.tar.xz 86605304 BLAKE2B 70bad66966e31009de7f16a039525b2bc3e84a9991e7d95227f8789ceca7313a219044f41c0ceec0ce357e8368a30833d7dc1cc35e9575d9b56efa20b9e35c03 SHA512 876e36578472d9de4c00651af9b26a79bbbc85161d03c58e381aac90be710999b9091524425332e950ed42b79d872ace6848798829e7d3d7bb6ae7dae0003559
 DIST warzone2100-videos-2.2.wz 571937134 BLAKE2B 60b70a71bd920e2d72ded5d519b17db2f3db4b0289edadeb58059a21aba7038b95219dc44cb807754461d1a9bdca60f0d7698be68622b8bd64a55efa949622d3 SHA512 ca1a1af51296afdaca137114821508c5783f077090e665eae0f6df895855f57c43f84434706309e819417f5f35d1c649bd14e96dc9fbbb1252d30a4f9a223cf6
-EBUILD warzone2100-3.2.3.ebuild 2609 BLAKE2B 05ae8aea178cb29c3776e5c0fcab5ba4442765ec76766689bc35f5cfc23c51bb7524f2dc6b12abdd07e77e87688f74fa13d8fbb705f7a76a7f3acea95b7151ea SHA512 9dcc1c4b6b095ee4ef895abf5b3a5a5d1c4d1e5c371baeced194a2592304aaf71b005a6ecdc0443d0b32f3cfb7998897f6c63d5cf909f5855f0127e91920294c
+EBUILD warzone2100-3.2.3.ebuild 2574 BLAKE2B 025a756979b5c40a2c486ed84a08013ddd3a3b7f397ba83e5d420b16410ddfe58d6bae20bdf75922a4289f5bee84d16179529c79cbe03d45ee581bcd1b1989d7 SHA512 448c367a65c0dd1f1ce5fd83c6e6ffa5e023767acd1e32f5cef15546911eb67c1ff315baa9afa0f4cc2f370bcde7ead305f8cb0aa7e7cf2a00976b84a7a09340
 EBUILD warzone2100-3.3.0.ebuild 2346 BLAKE2B a45c71a3e0f6b6592513e37d66658db108420f69a6ebc0a47213d151d3713c85d377ecb21bd07461b8affaee604f11410db0fe09d6a36d3400d8ce6dae9a9538 SHA512 0ae2aed3202e84c34f35fe77b16cfc903ce9aad6333c7a2974fd5cd3df98606c465bf27091de177ea38bf3d27aba648019be954df681aa352869e870135292dc
 MISC metadata.xml 674 BLAKE2B b0c40e88934cfbdbcbb7ffdbc277abcc3da3400de71f7508af51301f7ec5b6e00083ff2b59f59f7435a8e3f588291d7e5dbde19fa193b6fc78677b842cfb44ee SHA512 00aa4a109f41a0469e2b0e5daadcd33f9f3b255fdd2a724b7d116912ecb0b5fa4eb5e0dd7e4ae3e45f00c062c1034aa7d40143e48da0e66bab48da3d4e047dcc
diff --git a/games-strategy/warzone2100/warzone2100-3.2.3.ebuild b/games-strategy/warzone2100/warzone2100-3.2.3.ebuild
index 5e292dc3dc77..56daf63618e0 100644
--- a/games-strategy/warzone2100/warzone2100-3.2.3.ebuild
+++ b/games-strategy/warzone2100/warzone2100-3.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -75,7 +75,6 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
-		--docdir=/usr/share/doc/${PF}
 		--localedir=/usr/share/locale
 		--with-distributor="Gentoo ${PF}"
 		--with-icondir=/usr/share/icons/hicolor/128x128/apps