gentoo Easter resync : 12.04.2020

30 files changed, 152 insertions, 1082 deletions

diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index be7b9f85494f..e73646ada462 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/boswars/Manifest b/games-strategy/boswars/Manifest
deleted file mode 100644
index ba8b15347275..000000000000
--- a/games-strategy/boswars/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX boswars-2.7-gentoo.patch 606 BLAKE2B 0945db9d0b236de84676f31727b9974e0d67b1f8cb9f59e46178e0560166a6e506ecc4b555dc52fd4bd935dd253bbdce0ba243325cb1bc88a044c3de7f2e0aee SHA512 d538c1a5cd794b27c7f33989c5b1d3820cbcd7a4195d7cbd18dd92631aac4e5c2a3ab15447e178dcb2e51bcdcb00e939bf29c2f4b70b74a1ac44f841f52f6e98
-AUX boswars-2.7-scons-blows.patch 944 BLAKE2B 3594599a427660be601f21340a2a1ed992762b345988a3b6daffc766022234e455b166253aab35df7f67b6cd6a023268a5e9246e501e9f50117434ac45dcb288 SHA512 45e723feaa282760644e11a3e61e52726b6fffb388f7a6b5a0a47a97319e88341e238b46d8dbbe94cf178d5d18ea4ba8ebc257cd16dd98d8aa3cd5cff8d0eecd
-DIST bos.png 620 BLAKE2B c1759f8be923d8d1e0465a3a51affdab71276c78ec6f771fbb856bf46551e798ddf018d03b49f3a40fef65ea3b379aa63ee64d25f2e99a392507e4ca13934af1 SHA512 6a15a5c82f9cff3462d498620a1dd1c7a2a460119689078157e61b27e7e5243a8ac2da7f01c1848d614167a3a748ca1f3e03c1f218479ede3a1c2c0ae85b3cc3
-DIST boswars-2.7-fixed-images-for-libpng-1.6.tar.xz 552956 BLAKE2B a719fbd72a5f170281efc98441051b8e8740e0cbdd2b4ed147220cacb934794786cb34dd183863f53ddf5b80bf101857f51bda086408b435ca349475c7c1a2c5 SHA512 794addf06cfd5c5bb0ad0988a90337a3a6332789de7bc942807602c84c4fafe4c4b12da63ae210ca220a1be6dcd9677fa9ddb1ae62a7d26a7748af35b07303dc
-DIST boswars-2.7-src.tar.gz 77280735 BLAKE2B 641632faa07251f66cb2fd05efe79c398ba04a51dcbeecc97b3340346889fc6643da285e3976df2ed0ca50557f96a342ad9cc2d00de8cb65a02db65c2ac6c9e3 SHA512 2573c61684e83f356a80292adcf780cc001a4be2a31abba20e6f93ed6deaa38b8eca87f29935a4fe0edc9b4e0fdc3f78ddd709b8132aaaa048ffbcd6c498ec80
-EBUILD boswars-2.7-r2.ebuild 1535 BLAKE2B bf159bb4e1242c9cfded4cf8b479c6460bb38846b81b4efa8d7da1d1656ed5f12ed44ec07e5d0b08e9b5f761305d0435fde10415890c2413ae63ac9ff6aac341 SHA512 27decbfde53aff821aa3501781bbdbd9c5dd95dd0d7dcdcc69ae71157bcb377ea1aaf51303335d583ce277aa96177bef40eb7cc15172d424763d185d862ef3a8
-MISC metadata.xml 514 BLAKE2B 4f6163ce340262a203c22c2aad0c32973d66e3dcc79015ec4833c1c4dcb5decd182dc0643fee09aff12d123359ef9dcddd2d27771228406e8ca433879744fb19 SHA512 d253904f4c25482960a7815a05eccb8ff0c9acae13491713c47c98c90e012ad0cddc3e964529ab008e6db13602fe6b4d60df76a24ee66aac5f13efa13615440b
diff --git a/games-strategy/boswars/boswars-2.7-r2.ebuild b/games-strategy/boswars/boswars-2.7-r2.ebuild
deleted file mode 100644
index 679d91a6ab3b..000000000000
--- a/games-strategy/boswars/boswars-2.7-r2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils scons-utils
-
-DESCRIPTION="Futuristic real-time strategy game"
-HOMEPAGE="https://www.boswars.org"
-SRC_URI="https://www.boswars.org/dist/releases/${P}-src.tar.gz
-	https://dev.gentoo.org/~hasufell/distfiles/${P}-fixed-images-for-libpng-1.6.tar.xz
-	mirror://gentoo/bos.png"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-lang/lua:0
-	media-libs/libogg
-	media-libs/libpng:0
-	media-libs/libsdl[opengl,sound,video]
-	media-libs/libtheora
-	media-libs/libvorbis
-	virtual/opengl
-	x11-libs/libX11"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${P}-src
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-	"${FILESDIR}"/${P}-scons-blows.patch
-)
-
-src_unpack() {
-	default
-	# bug 475764
-	cp -dRp ${P}-fixed-images-for-libpng-1.6/* ${P}-src/ \
-		|| die "copying fixed images failed!"
-}
-
-src_prepare() {
-	default
-
-	rm -f doc/{README-SDL.txt,guichan-copyright.txt} || die
-
-	sed -i \
-		-e "s:@GENTOO_DATADIR@:/usr/share/${PN}:" \
-		engine/include/stratagus.h \
-		|| die
-	sed -i \
-		-e "/-O2/s:-O2.*math:${CXXFLAGS} -Wall:" \
-		SConstruct \
-		|| die
-}
-
-src_compile() {
-	escons || die
-}
-
-src_install() {
-	newbin build/${PN}-release ${PN}
-	insinto /usr/share/${PN}
-	doins -r campaigns graphics intro languages maps patches scripts sounds units
-	newicon "${DISTDIR}"/bos.png ${PN}.png
-	make_desktop_entry ${PN} "Bos Wars"
-	# COPYRIGHT.txt is referenced by the html
-	dodoc CHANGELOG COPYRIGHT.txt README.txt
-	dodoc -r doc/*
-}
diff --git a/games-strategy/boswars/files/boswars-2.7-gentoo.patch b/games-strategy/boswars/files/boswars-2.7-gentoo.patch
deleted file mode 100644
index a005f6f93ad0..000000000000
--- a/games-strategy/boswars/files/boswars-2.7-gentoo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru boswars-2.6.1-src/engine/include/stratagus.h boswars-2.6.1-src/engine/include/stratagus.h
---- boswars-2.6.1-src/engine/include/stratagus.h	2010-04-11 08:12:18.000000000 -0400
-+++ boswars-2.6.1-src/engine/include/stratagus.h	2010-05-22 02:33:50.021377764 -0400
-@@ -133,7 +133,7 @@
- --  General
- ----------------------------------------------------------------------------*/
- #ifndef STRATAGUS_LIB_PATH
--#define STRATAGUS_LIB_PATH  "."      /// Where to find the data files
-+#define STRATAGUS_LIB_PATH  "@GENTOO_DATADIR@"      /// Where to find the data files
- #endif
- 
- #ifndef STRATAGUS_HOME_PATH
diff --git a/games-strategy/boswars/files/boswars-2.7-scons-blows.patch b/games-strategy/boswars/files/boswars-2.7-scons-blows.patch
deleted file mode 100644
index 1d2c04cc4f1b..000000000000
--- a/games-strategy/boswars/files/boswars-2.7-scons-blows.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/SConstruct	2010-11-19 21:09:45.724976603 -0500
-+++ b/SConstruct	2010-11-19 21:11:05.723197985 -0500
-@@ -22,6 +22,7 @@
- ##
- 
- import os
-+import SCons.Util
- import sys
- import glob
- from stat import *
-@@ -50,6 +51,16 @@
- 
- opts = DefineOptions("build_options.py", ARGUMENTS)
- env = Environment(ENV = {'PATH':os.environ['PATH']}) # for an unknown reason Environment(options=opts) doesnt work well
-+if os.environ.has_key('CC'):
-+	env['CC'] = os.environ['CC']
-+if os.environ.has_key('CFLAGS'):
-+	env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
-+if os.environ.has_key('CXX'):
-+	env['CXX'] = os.environ['CXX']
-+if os.environ.has_key('CXXFLAGS'):
-+	env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
-+if os.environ.has_key('LDFLAGS'):
-+	env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
- opts.Update(env) # Needed as Environment(options=opts) doesnt seem to work
- Help(opts.GenerateHelpText(env))
- mingw = env.Clone()
diff --git a/games-strategy/boswars/metadata.xml b/games-strategy/boswars/metadata.xml
deleted file mode 100644
index 242aa2331bb7..000000000000
--- a/games-strategy/boswars/metadata.xml
+++ /dev/null
@@ -1,13 +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>
-<longdescription lang="en">
-Bos Wars is a futuristic real-time strategy game. It is possible to play against
-human opponents over LAN, internet, or against the computer.
-Bos Wars aims to create a completely original and fun open source RTS game.
-</longdescription>
-</pkgmetadata>
diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 4fe2efb84614..6a6adcf9a154 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,8 +1,5 @@
-AUX freeciv-2.5.11-freetype_pkgconfig.patch 8120 BLAKE2B cbcb39010d40abd530b8b30955c0461b7207698bb2e0701469e696d3ad3be6b3b0887d58623c7589784edd6961485517e18877dfbe9c011292e29b94dbcffb94 SHA512 525d3829fa17401cde3a0324d1342d4513decf6996864fa5d02462e2449d0895e8048fa71bd255b028b2ed084f8ca4734536cb86f85dd00d65e14d0f68b41184
 DIST freeciv-2.5.12.tar.bz2 40983794 BLAKE2B 53c5f9833684bef20a80c891bb001b2e03c819ba57c0989463b854fda7fe2cffe16d292e8f13f8bf8253aee0691c8ad1cb6f19522c5aae69b48165d26a0c3665 SHA512 bc0de8f2e63779ab0ac57b9a1dfd6ab30b4ad973c9ed1704ae7c1575ec63a695e65016f45abf5ad44b9d3818211aa351b74492783a4155cf19357b7f1dd2554d
-DIST freeciv-2.6.1.tar.bz2 51915573 BLAKE2B 160df7f59a5d2ab8090132df5c690ee96ce6811ad0644341ba07b10000bc2e4c30ef4e60ead57d17a7d0f722e42c204d839264830c7b423ccc393b7e7b30c30b SHA512 44145eaea96d5ab4f18e843102209d0f88a626af37365cf91b5e592bcac45f2692a7e21e9b3454a3ee4b9099212f5826a4687931bb37dabbb7dedad059df1cb4
 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.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/files/freeciv-2.5.11-freetype_pkgconfig.patch b/games-strategy/freeciv/files/freeciv-2.5.11-freetype_pkgconfig.patch
deleted file mode 100644
index d2b321dde274..000000000000
--- a/games-strategy/freeciv/files/freeciv-2.5.11-freetype_pkgconfig.patch
+++ /dev/null
@@ -1,242 +0,0 @@
-From f2eafd087a20b4236c1f2f1324e8644cb5055bf9 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Wed, 16 May 2018 20:41:22 +0200
-Subject: [PATCH] Use pkg-config to find freetype
-
-As of freetype-2.9.1 the freetype-config script no longer gets installed
-by default.
----
- Makefile.am      |   1 -
- m4/freetype2.m4  | 194 -----------------------------------------------
- m4/sdl-client.m4 |   2 +-
- 3 files changed, 1 insertion(+), 196 deletions(-)
- delete mode 100644 m4/freetype2.m4
-
-diff --git a/Makefile.am b/Makefile.am
-index 5d5a187d47..51791433ab 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -64,7 +64,6 @@ EXTRA_DIST =	autogen.sh 			\
- 		m4/fcdb-postgres.m4		\
- 		m4/fcdb-sqlite3.m4		\
- 		m4/features.m4			\
--		m4/freetype2.m4			\
- 		m4/gettimeofday.m4		\
- 		m4/ggz.m4			\
- 		m4/freeciv-gettext.m4		\
-diff --git a/m4/freetype2.m4 b/m4/freetype2.m4
-deleted file mode 100644
-index 3d0ecb3554..0000000000
---- a/m4/freetype2.m4
-+++ /dev/null
-@@ -1,194 +0,0 @@
--# Configure paths for FreeType2
--# Marcelo Magallon 2001-10-26, based on gtk.m4 by Owen Taylor
--#
--# Copyright 2001, 2003, 2007, 2009 by
--# David Turner, Robert Wilhelm, and Werner Lemberg.
--#
--# This file is part of the FreeType project, and may only be used, modified,
--# and distributed under the terms of the FreeType project license,
--# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
--# indicate that you have read the license and understand and accept it
--# fully.
--#
--# As a special exception to the FreeType project license, this file may be
--# distributed as part of a program that contains a configuration script
--# generated by Autoconf, under the same distribution terms as the rest of
--# that program.
--#
--# serial 3
--
--# AC_CHECK_FT2([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
--# Test for FreeType 2, and define FT2_CFLAGS and FT2_LIBS.
--# MINIMUM-VERSION is what libtool reports; the default is `7.0.1' (this is
--# FreeType 2.0.4).
--#
--AC_DEFUN([AC_CHECK_FT2],
--  [# Get the cflags and libraries from the freetype-config script
--   #
--   AC_ARG_WITH([ft-prefix],
--     dnl don't quote AS_HELP_STRING!
--     AS_HELP_STRING([--with-ft-prefix=PREFIX],
--                    [Prefix where FreeType is installed (optional)]),
--     [ft_config_prefix="$withval"],
--     [ft_config_prefix=""])
--
--   AC_ARG_WITH([ft-exec-prefix],
--     dnl don't quote AS_HELP_STRING!
--     AS_HELP_STRING([--with-ft-exec-prefix=PREFIX],
--                    [Exec prefix where FreeType is installed (optional)]),
--     [ft_config_exec_prefix="$withval"],
--     [ft_config_exec_prefix=""])
--
--   AC_ARG_ENABLE([freetypetest],
--     dnl don't quote AS_HELP_STRING!
--     AS_HELP_STRING([--disable-freetypetest],
--                    [Do not try to compile and run a test FreeType program]),
--     [],
--     [enable_fttest=yes])
--
--   if test x$ft_config_exec_prefix != x ; then
--     ft_config_args="$ft_config_args --exec-prefix=$ft_config_exec_prefix"
--     if test x${FT2_CONFIG+set} != xset ; then
--       FT2_CONFIG=$ft_config_exec_prefix/bin/freetype-config
--     fi
--   fi
--
--   if test x$ft_config_prefix != x ; then
--     ft_config_args="$ft_config_args --prefix=$ft_config_prefix"
--     if test x${FT2_CONFIG+set} != xset ; then
--       FT2_CONFIG=$ft_config_prefix/bin/freetype-config
--     fi
--   fi
--
--   if test "x$FT2_CONFIG" = x ; then
--     AC_PATH_PROG([FT2_CONFIG], [freetype-config], [no])
--   fi
--
--   min_ft_version=m4_if([$1], [], [7.0.1], [$1])
--   AC_MSG_CHECKING([for FreeType -- version >= $min_ft_version])
--   no_ft=""
--   if test "$FT2_CONFIG" = "no" ; then
--     no_ft=yes
--   else
--     FT2_CFLAGS=`$FT2_CONFIG $ft_config_args --cflags`
--     FT2_LIBS=`$FT2_CONFIG $ft_config_args --libs`
--     ft_config_major_version=`$FT2_CONFIG $ft_config_args --version | \
--       sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
--     ft_config_minor_version=`$FT2_CONFIG $ft_config_args --version | \
--       sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
--     ft_config_micro_version=`$FT2_CONFIG $ft_config_args --version | \
--       sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
--     ft_min_major_version=`echo $min_ft_version | \
--       sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
--     ft_min_minor_version=`echo $min_ft_version | \
--       sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
--     ft_min_micro_version=`echo $min_ft_version | \
--       sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
--     if test x$enable_fttest = xyes ; then
--       ft_config_is_lt=""
--       if test $ft_config_major_version -lt $ft_min_major_version ; then
--         ft_config_is_lt=yes
--       else
--         if test $ft_config_major_version -eq $ft_min_major_version ; then
--           if test $ft_config_minor_version -lt $ft_min_minor_version ; then
--             ft_config_is_lt=yes
--           else
--             if test $ft_config_minor_version -eq $ft_min_minor_version ; then
--               if test $ft_config_micro_version -lt $ft_min_micro_version ; then
--                 ft_config_is_lt=yes
--               fi
--             fi
--           fi
--         fi
--       fi
--       if test x$ft_config_is_lt = xyes ; then
--         no_ft=yes
--       else
--         ac_save_CFLAGS="$CFLAGS"
--         ac_save_LIBS="$LIBS"
--         CFLAGS="$CFLAGS $FT2_CFLAGS"
--         LIBS="$FT2_LIBS $LIBS"
--
--         #
--         # Sanity checks for the results of freetype-config to some extent.
--         #
--         AC_RUN_IFELSE([
--             AC_LANG_SOURCE([[
--
--#include <ft2build.h>
--#include FT_FREETYPE_H
--#include <stdio.h>
--#include <stdlib.h>
--
--int
--main()
--{
--  FT_Library library;
--  FT_Error  error;
--
--  error = FT_Init_FreeType(&library);
--
--  if (error)
--    return 1;
--  else
--  {
--    FT_Done_FreeType(library);
--    return 0;
--  }
--}
--
--             ]])
--           ],
--           [],
--           [no_ft=yes],
--           [echo $ECHO_N "cross compiling; assuming OK... $ECHO_C"])
--
--         CFLAGS="$ac_save_CFLAGS"
--         LIBS="$ac_save_LIBS"
--       fi             # test $ft_config_version -lt $ft_min_version
--     fi               # test x$enable_fttest = xyes
--   fi                 # test "$FT2_CONFIG" = "no"
--
--   if test x$no_ft = x ; then
--     AC_MSG_RESULT([yes])
--     m4_if([$2], [], [:], [$2])
--   else
--     AC_MSG_RESULT([no])
--     if test "$FT2_CONFIG" = "no" ; then
--       AC_MSG_WARN([
--
--  The freetype-config script installed by FreeType 2 could not be found.
--  If FreeType 2 was installed in PREFIX, make sure PREFIX/bin is in
--  your path, or set the FT2_CONFIG environment variable to the
--  full path to freetype-config.
--       ])
--     else
--       if test x$ft_config_is_lt = xyes ; then
--         AC_MSG_WARN([
--
--  Your installed version of the FreeType 2 library is too old.
--  If you have different versions of FreeType 2, make sure that
--  correct values for --with-ft-prefix or --with-ft-exec-prefix
--  are used, or set the FT2_CONFIG environment variable to the
--  full path to freetype-config.
--         ])
--       else
--         AC_MSG_WARN([
--
--  The FreeType test program failed to run.  If your system uses
--  shared libraries and they are installed outside the normal
--  system library path, make sure the variable LD_LIBRARY_PATH
--  (or whatever is appropriate for your system) is correctly set.
--         ])
--       fi
--     fi
--
--     FT2_CFLAGS=""
--     FT2_LIBS=""
--     m4_if([$3], [], [:], [$3])
--   fi
--
--   AC_SUBST([FT2_CFLAGS])
--   AC_SUBST([FT2_LIBS])])
--
--# end of freetype2.m4
-diff --git a/m4/sdl-client.m4 b/m4/sdl-client.m4
-index 095cd0b287..015d948d95 100644
---- a/m4/sdl-client.m4
-+++ b/m4/sdl-client.m4
-@@ -30,7 +30,7 @@ AC_DEFUN([FC_SDL_CLIENT],
-         missing_project="SDL_gfx"
-       fi
-       if test "x$sdl_h_found" = "xyes" ; then
--        AC_CHECK_FT2([2.1.3], [freetype_found="yes"], [freetype_found="no"])
-+        PKG_CHECK_MODULES(FT2, freetype2 >= 7.0.1, [freetype_found="yes"], [freetype_found="no"])
-         if test "$freetype_found" = yes; then
- 	  gui_sdl_cflags="$gui_sdl_cflags $FT2_CFLAGS"
- 	  gui_sdl_libs="$gui_sdl_libs $FT2_LIBS"
--- 
-2.18.0
-
diff --git a/games-strategy/freeciv/freeciv-2.6.1.ebuild b/games-strategy/freeciv/freeciv-2.6.1.ebuild
deleted file mode 100644
index 764443f246c5..000000000000
--- a/games-strategy/freeciv/freeciv-2.6.1.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PV="${PV/_beta/-beta}"
-MY_PV="${MY_PV/_rc/-RC}"
-MY_P="${PN}-${MY_PV}"
-inherit desktop flag-o-matic xdg
-
-DESCRIPTION="multiplayer strategy game (Civilization Clone)"
-HOMEPAGE="http://www.freeciv.org/"
-
-if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-	SRC_URI="mirror://sourceforge/freeciv/${MY_P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="aimodules auth dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline sdl +server +sound sqlite system-lua"
-
-# postgres isn't yet really supported by upstream
-BDEPEND="
-	virtual/pkgconfig
-	!dedicated? (
-		x11-base/xorg-proto
-		nls? ( sys-devel/gettext )
-	)
-"
-DEPEND="
-	app-arch/bzip2
-	app-arch/xz-utils
-	net-misc/curl
-	sys-libs/zlib
-	auth? (
-		!mysql? ( ( !sqlite? ( dev-db/mysql-connector-c:0= ) ) )
-		mysql? ( dev-db/mysql-connector-c:0= )
-		sqlite? ( dev-db/sqlite:3 )
-	)
-	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? ( !gtk? ( x11-libs/gtk+:2 ) )
-		sdl? (
-			media-libs/libsdl2[video]
-			media-libs/sdl2-gfx
-			media-libs/sdl2-image[png]
-			media-libs/sdl2-ttf
-		)
-		server? ( aimodules? ( sys-devel/libtool:2 ) )
-		sound? (
-			media-libs/libsdl2[sound]
-			media-libs/sdl2-mixer[vorbis]
-		)
-	)
-	readline? ( sys-libs/readline:0= )
-	system-lua? ( >=dev-lang/lua-5.3:= )
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-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
-
-	# 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
-			--enable-freeciv-manual=html
-		)
-	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+=( sdl2 )
-			use gtk && myclient+=( gtk2 )
-			if use qt5 ; then
-				myclient+=( qt )
-				append-cxxflags -std=c++11
-			fi
-		fi
-		myeconfargs+=(
-			$(use_enable server)
-			$(use_enable server freeciv-manual html )
-		)
-	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 classic*.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
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest
index 97455e1309e2..7e17a283580b 100644
--- a/games-strategy/freeorion/Manifest
+++ b/games-strategy/freeorion/Manifest
@@ -1,8 +1,6 @@
 AUX freeorion-0.4.7.1-backport-sdl2-include-dir-fix.patch 1030 BLAKE2B d0b4a58e85fd878fc5d332ca0f552889aff752fd8198f66d217cc54aad1ddb83cf24108d978bd0155b13a6db9d7f11f35f2b76f76456acd9ab38b1e28dbc5332 SHA512 ffd493373ccb0051aa2b41d0bd740865fa13db3ed50fbf95e83c6d97fe81e3ff04c24e865d73b011dbd0085c45a0b1a915c62eaa103ecf29a3264030d1d9ae4e
 AUX freeorion.envd 70 BLAKE2B a893f14754bfb7617f4a250dce8d64ea3de6c0ed3ad51fb62d46baf39ac3e4ead44a51e22e934d206eeef77b5bbdb2e4240178e856def0280ed38607647b4909 SHA512 ed9e2adf837cd381241dacf4da446a8ded1486c51a011eaf0cdf84b62831cd005f3e210b8f31847f9aba1d54ddd5f352fde6b33eefb215ab264ff53c3e3be74b
-DIST freeorion-0.4.7.1.tar.gz 105942075 BLAKE2B f75940ac79e329fd7e03e85b1cd712ff6dcf06583ad8feff43f8b2d6e28a53c9029724d1450d26d2367bafd1d04858e3659b8e47986df96657d91526f594eb5e SHA512 9c8d0437ee827a1104a541e1123ce6b5d229bd6253bfe275028805a4c34de882ca3a9d5361e3f64098f935d0926a656a64fe468690c8d195e05de86cd1b2699d
-DIST freeorion-0.4.8_p20190501.tar.gz 106506540 BLAKE2B 5442eeeaff486a5525b4282c7ef72001a935c4429fea89a720f94a033a2c29e56855605376efe22d13194ae3f49105fe26f37554d2c8d560bfb76dc69d738128 SHA512 d378c0e9b63118261bf5ac1c99190929ff0cd52b3a270e43fe2be80cc7993457bcc7b70083ff493a6b96b250e1988e40470bef410af5ce3d49644ccf934974d3
-EBUILD freeorion-0.4.7.1-r4.ebuild 1844 BLAKE2B bd5c77199e91d7d87b54b50ec372e583e4adc24c4b31847a1d08c63898eac39f61b7d5102e756afc68975eb37c92e3a64e3669bb03c27e0abfe171655781e4ac SHA512 654abb21694b545c4c56519ea3e4f31a7611b640948f41298b4fcd79dd884ce642200e9bdf8b4b89f519168b336319cee793a6a4f8a4e9909a8d1febc4e2664c
-EBUILD freeorion-0.4.8_p20190501-r1.ebuild 1761 BLAKE2B 24e639af83c5d49f01857fb8b8fa217388cf9c97e2477e0bcb46986e77c1acffaead0806f18059fa426714780b369aa550cefe80d455f4789ae084d312b91939 SHA512 26e59e43665b20999b41df5d0866301939452f83d94f521fbe8a92aeccde8954548d9f61581755c507ec02f33f97213f17a987bef9584131b9e47761553e5b73
-EBUILD freeorion-9999.ebuild 1761 BLAKE2B 24e639af83c5d49f01857fb8b8fa217388cf9c97e2477e0bcb46986e77c1acffaead0806f18059fa426714780b369aa550cefe80d455f4789ae084d312b91939 SHA512 26e59e43665b20999b41df5d0866301939452f83d94f521fbe8a92aeccde8954548d9f61581755c507ec02f33f97213f17a987bef9584131b9e47761553e5b73
+DIST freeorion-0.4.9_p20200409.tar.gz 124663848 BLAKE2B 7468a386829498c9ca971e686bda216002b6f263fbc0f3784e7898854ad91278441579c1a3e0d1ef2d92b46747d14a17463e46d7ba16f06633e9a5d474ce3b9c SHA512 09fe8db818c3f22bac94577461d9ada082a2c8365cb524948bf13650ea368fcc55043f4df2f9701075011c890a08197e7f7bb13d8884cb41cc8e1346b8538345
+EBUILD freeorion-0.4.9_p20200409.ebuild 1659 BLAKE2B 4ac8aaffea568c30bd0bb3dcf8e664f72e7baa9de32b4ee7958635eb3d1b410a1a679aea9d9df514fcea098130212f0a1c985469ef82cb26c51f199757149c1c SHA512 c3f055bc27735e31a9fb1f54b2abcb85505cd6fbb683cff70716256cede43cc408e70b13ef21eafacd833fa57c8a2d0fb16c9cd17fe9c7f76fb8262cbea6a6ac
+EBUILD freeorion-9999.ebuild 1659 BLAKE2B 4ac8aaffea568c30bd0bb3dcf8e664f72e7baa9de32b4ee7958635eb3d1b410a1a679aea9d9df514fcea098130212f0a1c985469ef82cb26c51f199757149c1c SHA512 c3f055bc27735e31a9fb1f54b2abcb85505cd6fbb683cff70716256cede43cc408e70b13ef21eafacd833fa57c8a2d0fb16c9cd17fe9c7f76fb8262cbea6a6ac
 MISC metadata.xml 684 BLAKE2B 1c415c0258973d2953f7ee0a9ff5811b17cff7000a499e2568c56b09f6c7ca40aedd345c1f377822bb0d30d50638fe76eb1e12da19da0a86b76bba9919633199 SHA512 e569a1bb722ad194a47292a6c67670fef05f5f1ac390245c81140e8fcc57f2699eec4e8037e3cae31d46d7e62eac8504d69971dc7db76226f2a31f85bb531bb1
diff --git a/games-strategy/freeorion/freeorion-0.4.7.1-r4.ebuild b/games-strategy/freeorion/freeorion-0.4.7.1-r4.ebuild
deleted file mode 100644
index 3811c4a25749..000000000000
--- a/games-strategy/freeorion/freeorion-0.4.7.1-r4.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit cmake-utils python-single-r1 gnome2-utils
-
-DESCRIPTION="A free turn-based space empire and galactic conquest game"
-HOMEPAGE="http://www.freeorion.org"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/freeorion/freeorion.git"
-else
-	MY_PV="${PV/_/-}"
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-fi
-
-LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0"
-SLOT="0"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-libs/boost-1.56:=[python,threads,${PYTHON_MULTI_USEDEP}]
-	')
-	media-libs/freealut
-	media-libs/freetype
-	media-libs/glew:=
-	media-libs/libsdl2
-	>=media-libs/libogg-1.1.3
-	media-libs/libpng:0
-	media-libs/libsdl2[X,opengl,video]
-	>=media-libs/libvorbis-1.1.2
-	media-libs/openal
-	sci-physics/bullet
-	sys-libs/zlib
-	virtual/opengl
-	${PYTHON_DEPS}
-	!dev-games/gigi"
-	# Use bundled gigi as of freeorion-0.4.3
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${P}-backport-sdl2-include-dir-fix.patch" )
-
-pkg_setup() {
-	# build system is using FindPythonLibs.cmake which needs python:2
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -e "s/-O3//" -i CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_BUILD_TYPEE=Release
-		-DRELEASE_COMPILE_FLAGS=""
-		-DCMAKE_SKIP_RPATH=ON
-	)
-
-	append-cppflags -DBOOST_OPTIONAL_CONFIG_USE_OLD_IMPLEMENTATION_OF_OPTIONAL
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc ChangeLog.md
-
-	newenvd "${FILESDIR}/${PN}.envd" 99${PN}
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-strategy/freeorion/freeorion-0.4.8_p20190501-r1.ebuild b/games-strategy/freeorion/freeorion-0.4.9_p20200409.ebuild
index 5bf1f6f4f99a..048d1b8bf695 100644
--- a/games-strategy/freeorion/freeorion-0.4.8_p20190501-r1.ebuild
+++ b/games-strategy/freeorion/freeorion-0.4.9_p20200409.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 inherit cmake-utils python-single-r1 xdg
 
 DESCRIPTION="A free turn-based space empire and galactic conquest game"
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	KEYWORDS="~amd64"
 	if [[ ${PV} = *_p* ]]; then
-		COMMIT="2a49c05796f1c92b96ce9b2aeaf0124fc8be7a77"
+		COMMIT="1570afb475763b13f5d2f434037ec907da812bb4"
 		SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 		S="${WORKDIR}/${PN}-${COMMIT}"
 	else
@@ -35,7 +35,7 @@ BDEPEND="
 "
 RDEPEND="
 	$(python_gen_cond_dep '
-		>=dev-libs/boost-1.58:=[python,threads,${PYTHON_MULTI_USEDEP}]
+		>=dev-libs/boost-1.67:=[python,threads,${PYTHON_MULTI_USEDEP}]
 	')
 	!dedicated? (
 		media-libs/freealut
@@ -54,11 +54,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-pkg_setup() {
-	# build system is using FindPythonLibs.cmake which needs python:2
-	python-single-r1_pkg_setup
-}
-
 src_prepare() {
 	sed -e "s/-O3//" -i CMakeLists.txt || die
 
diff --git a/games-strategy/freeorion/freeorion-9999.ebuild b/games-strategy/freeorion/freeorion-9999.ebuild
index 5bf1f6f4f99a..048d1b8bf695 100644
--- a/games-strategy/freeorion/freeorion-9999.ebuild
+++ b/games-strategy/freeorion/freeorion-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 inherit cmake-utils python-single-r1 xdg
 
 DESCRIPTION="A free turn-based space empire and galactic conquest game"
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	KEYWORDS="~amd64"
 	if [[ ${PV} = *_p* ]]; then
-		COMMIT="2a49c05796f1c92b96ce9b2aeaf0124fc8be7a77"
+		COMMIT="1570afb475763b13f5d2f434037ec907da812bb4"
 		SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 		S="${WORKDIR}/${PN}-${COMMIT}"
 	else
@@ -35,7 +35,7 @@ BDEPEND="
 "
 RDEPEND="
 	$(python_gen_cond_dep '
-		>=dev-libs/boost-1.58:=[python,threads,${PYTHON_MULTI_USEDEP}]
+		>=dev-libs/boost-1.67:=[python,threads,${PYTHON_MULTI_USEDEP}]
 	')
 	!dedicated? (
 		media-libs/freealut
@@ -54,11 +54,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-pkg_setup() {
-	# build system is using FindPythonLibs.cmake which needs python:2
-	python-single-r1_pkg_setup
-}
-
 src_prepare() {
 	sed -e "s/-O3//" -i CMakeLists.txt || die
 
diff --git a/games-strategy/lightyears/Manifest b/games-strategy/lightyears/Manifest
deleted file mode 100644
index a5a268d8f4e6..000000000000
--- a/games-strategy/lightyears/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX lightyears-1.4-gentoo.patch 1280 BLAKE2B fd247d049fe7e32264a0d86ffa06f37ca8a8ffb4fd7b5651adce2008f089b1b83758286b46e33555c61b4a62fb79e6ed93475bf51aff599117fc5eedbfe70680 SHA512 4a8770b29c7aa8b489a8afaac7ba3ec9a2efc1466f6263f35ee531a8e4498a1490080bd390a87309983d62ac0d3a722421058d671c32c7cda91bcc6a94d81be3
-DIST lightyears-1.4.tar.bz2 693877 BLAKE2B 871b8f66088c3a947de50e7b47a8aeef4d06f9c7919f4f361a6719ff0dfa6b48acabb759dca6969d09255e2c89c158caa0cd560ef02567df6e46bbcda2eb9417 SHA512 68f576d820d54b353adbc504f8aa3341547e2e56474717cc59aecc2368fc0eb533458e09876b3cd2a9062914a8a58d39a35ce944256372bb9e15830210924597
-EBUILD lightyears-1.4-r3.ebuild 1149 BLAKE2B b6a3ceb7e90e36a592f9f453e7f912260c4c734c3ac994035eed763e1da81546df9ece9cce210c009ca53c46a467217b0201fe17e702f638c6905c3c55d1bc6a SHA512 c46b3c155b32fc207717ce5c1cc5b6b062edc9817a147e92a3ec75aa60c844963ebfd23ee8b1e823cfddd01faec4377ca801a8183685a34fbc7bd8dbd7169c18
-MISC metadata.xml 457 BLAKE2B 7f250bdb961fe6d994ebc983f8dfaf3cbe7c4763b766fbcbc199b2db3f33ca273136e827adece324f4c00b611521882b932a1750a372258e0d52daf691a2c1bb SHA512 354fad5eed1305fc7e5ed69de92f7033b651371a1993ccd90d3d6fd9f49975e30e8b5b4c8cfcf8bb6f1284b5ef0df790adf863f76f580945ff3699ff275d5c13
diff --git a/games-strategy/lightyears/files/lightyears-1.4-gentoo.patch b/games-strategy/lightyears/files/lightyears-1.4-gentoo.patch
deleted file mode 100644
index 325c4365ded4..000000000000
--- a/games-strategy/lightyears/files/lightyears-1.4-gentoo.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/lightyears
-+++ b/lightyears
-@@ -1,7 +1,6 @@
- #!/usr/bin/python
- 
- # Set the location of the LightYears files here:
--LIGHTYEARS_DIR = "."
- # LIGHTYEARS_DIR = "/usr/share/games/lightyears" # (for Debian)
- 
- # Save games and configuration files are stored in the user's
-@@ -10,31 +9,6 @@
- import sys, os
- 
- if __name__ == "__main__":
--    # Path to data/code dir can be overridden by environment variable
--    LIGHTYEARS_DIR = os.environ.get("LIGHTYEARS_DIR", LIGHTYEARS_DIR)
--
--    # Path does not exist? Try current directory.
--    if ((LIGHTYEARS_DIR == None)
--    or (not os.path.isdir(LIGHTYEARS_DIR))
--    or (not os.path.isfile(os.path.join(LIGHTYEARS_DIR, 
--                            'code', 'startup.py')))):
--        LIGHTYEARS_DIR = os.getcwd()
--
--    # Paths obtained
--    sys.path.insert(0, os.path.join(LIGHTYEARS_DIR, 'code'))
--    data_dir = os.path.join(LIGHTYEARS_DIR, 'data')
--
--    # Go
--    try:
--        import startup
--        assert os.path.isdir(data_dir)
--    except:
--        print "Unable to find LightYears code & data in:"
--        for p in sys.path:
--            print '  ', p
--
--        sys.exit(1)
--
--    startup.Main(data_dir)
--    
--
-+    sys.path.insert(0, "@GENTOO_LIBDIR@")
-+    import startup
-+    startup.Main("@GENTOO_DATADIR@/data")
diff --git a/games-strategy/lightyears/lightyears-1.4-r3.ebuild b/games-strategy/lightyears/lightyears-1.4-r3.ebuild
deleted file mode 100644
index e0e5bb0741d9..000000000000
--- a/games-strategy/lightyears/lightyears-1.4-r3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit desktop python-single-r1 xdg-utils
-
-DESCRIPTION="A single-player game with a science-fiction theme"
-HOMEPAGE="https://www.jwhitham.org/20kly/"
-SRC_URI="https://www.jwhitham.org/20kly/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/pygame[${PYTHON_MULTI_USEDEP}]
-	')
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}"-gentoo.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "s:@GENTOO_LIBDIR@:/usr/$(get_libdir)/${PN}:" \
-		-e "s:@GENTOO_DATADIR@:/usr/share/${PN}:" \
-		${PN} || die
-
-	python_fix_shebang .
-}
-
-src_install() {
-	dobin ${PN}
-
-	insinto /usr/"$(get_libdir)/${PN}"
-	doins code/*.py
-
-	einstalldocs
-
-	insinto "/usr/share/${PN}"
-	doins -r audio data manual
-
-	python_optimize "${ED}/usr/$(get_libdir)/${PN}"
-
-	newicon data/32.png ${PN}.png
-	make_desktop_entry ${PN} "Light Years Into Space"
-}
-
-pkg_postinst() { xdg_icon_cache_update; }
-pkg_postrm() { xdg_icon_cache_update; }
diff --git a/games-strategy/lightyears/metadata.xml b/games-strategy/lightyears/metadata.xml
deleted file mode 100644
index c314eef5e089..000000000000
--- a/games-strategy/lightyears/metadata.xml
+++ /dev/null
@@ -1,13 +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>
-<longdescription lang="en">
-"20,000 Light Years Into Space" was written for Pyweek (March 2006) by Jack
-Whitham. It is a single-player real-time strategy game with a science-fiction
-theme.
-</longdescription>
-</pkgmetadata>
diff --git a/games-strategy/outerspace/Manifest b/games-strategy/outerspace/Manifest
deleted file mode 100644
index 6e874a997db0..000000000000
--- a/games-strategy/outerspace/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX outerspace 169 BLAKE2B 432402aa2fa9b80c2a5d22f22e5858dd6d618145d37abe54736d7a23fbfcc20dbe6e8c8e2427a4e561960b338def2bd0c28f37f5fdcfcbfc1983b740f3f2a1f3 SHA512 fd20d9de084fef162eec391d68dc973df566b62fd2254fe8ad92c91b073341ca17f96844e0cae28592a7a4d05cc6e3744d66cd37dce9b70319678b91db8d8a1b
-AUX outerspace-0.5.68-setup.patch 1652 BLAKE2B 60d940c6c6c8c95452288abc13873aceff6d8cd6dd1216a61ca02de5bd1e834365fd2bbc0d6dd38500b1e2b764ccd1d629831871b40d2d45c708460939d23120 SHA512 b3d7f604724e6990436808dc62214a55325278cc04006fbe8438a213e772615a46b2969f88b03364332154af3cf996c7bdce05cc40dd5d24938bf6b537f9884b
-DIST outerspace-0.5.68.tar.gz 2249703 BLAKE2B 16b8c2d6c4e0516867d9a07a2762112da39f9a1074dffad9a9a3c343dd75662cba74d50f2a028b530013f320ffd7481317d061a3ebb449e9acf2f41bf56312a3 SHA512 dc2cbebf16fefabcc3356efb496766b90a5eabbf218f085fdc83cf956ca9503e99ef3154e0905c2432a3bf7caabd1f2af585a43397ba368581cd66546fcddc6b
-DIST outerspace_0.5.68-0ubuntu1_all.deb 2634188 BLAKE2B fd1667ae130e9a0ed603c369e9751d0b83414f20dd06c2f7e9941e2c465bdad0ff050ca41a928906bc5cc755eb05c0a5dfa18a8c35c868650c3fec6cf2e4f1f8 SHA512 9520cf1207a59497d6253b42bc34d580f9b805cf4ae55a5c921082e965892aa67921c4624ea94a5145c911dc2b24a1cca2806c06770ef8d1ded10855fb42666c
-EBUILD outerspace-0.5.68-r1.ebuild 1603 BLAKE2B be05cbb59ec93992e875d9ef8d685dfb7b51f5d00634a8503fd57a81593a16f4aa5a1d53fc3d10affda9abfbbca1eff4846c0c059f72224965ecb2a57364b2c4 SHA512 d3b95c85a666a5c99345e0ea56130dc2eb784b84fd6da717d0faf2a881630a4ef0bbf126d5fd69e5ed9badd0a04ba96330d1f1e1f6a6571e1d2420bf14af9383
-MISC metadata.xml 831 BLAKE2B 2eb39d75eca89288ab8dcb4ff274891d62e4c9a9540ceb2a2f887e2743c28c4d04b8692a093e24c0226b88d2dbe938b268ef17de4974e5c127422ed387bac6a7 SHA512 d607343f2cc56162b694e28523cf256339a306b03bcca9c0148c59700491249a9acc6cfc193467cbdd04d8ea9bb564816747276143b3e4e1bf3dc7deab480d1e
diff --git a/games-strategy/outerspace/files/outerspace b/games-strategy/outerspace/files/outerspace
deleted file mode 100644
index 2a6bbe26dafb..000000000000
--- a/games-strategy/outerspace/files/outerspace
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-mkdir -p ~/.outerspace
-cd ~/.outerspace || exit 1
-
-ln -sf "@GENTOO_LIBDIR@"/{osc.py,lib,libsrvr} .
-ln -sf "@GENTOO_DATADIR@"/res .
-
-exec python osc.py "$@"
diff --git a/games-strategy/outerspace/files/outerspace-0.5.68-setup.patch b/games-strategy/outerspace/files/outerspace-0.5.68-setup.patch
deleted file mode 100644
index c95852dca3dc..000000000000
--- a/games-strategy/outerspace/files/outerspace-0.5.68-setup.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -42,12 +42,7 @@
- 
- # collect data files
- data_files = []
--data_files.append(
--    (
--        ".",
--        ["../ChangeLog.txt", "../COPYING", "../README", "../README_CZ"]
--    )
--)
-+
- 
- # resources
- for root, dirs, files in os.walk('res'):
-@@ -57,16 +52,6 @@
-         pass
-     if files:
-         data_files.append((root, [os.path.join(root, file) for file in files]))
--
--data_files.append(
--    (
--        "res/techspec",
--        [
--            "../server/lib/ige/ospace/Rules/techs.spf",
--            "../server/lib/ige/ospace/Rules/Tech.spf",
--        ]
--    )
--)
- 
- if havePy2Exe:
-     data_files.append((".", ["../updater/update.exe"]))
-@@ -114,10 +99,3 @@
-     **extraArgs
- )
- 
--# cleanup
--def onerror(func, path, err):
--    if func is os.remove:
--        os.chmod(path, stat.S_IWRITE)
--        os.remove(path)
--
--shutil.rmtree("libsrvr", onerror = onerror)
---- a/osc.py
-+++ b/osc.py
-@@ -23,12 +23,36 @@
- # tweak PYTHONPATH
- import sys
- import os
-+import errno
- sys.path.insert(0, "lib")
- 
- for item in ("libsrvr", "../server/lib"):
-     if os.path.exists(item):
-         sys.path.insert(0, item)
-         break
-+
-+userdir=os.path.expanduser("~/.outerspace")
-+resdir=os.path.join(userdir, "res")
-+rootresdir="@GENTOO_DATADIR@/res"
-+
-+if not (os.path.isdir(userdir)):
-+	try:
-+		os.makedirs(userdir)
-+	except:
-+		sys.exit("unable to create %s" % userdir)
-+
-+try:
-+	os.symlink(rootresdir, resdir)
-+except OSError, e:
-+	if e.errno == errno.EEXIST:
-+		os.remove(resdir)
-+		os.symlink(rootresdir, resdir)
-+
-+try:
-+	os.chdir(userdir)
-+except:
-+	sys.exit("unable to cd into %s" % userdir)
-+
- 
- #configure gc
- #import gc
diff --git a/games-strategy/outerspace/metadata.xml b/games-strategy/outerspace/metadata.xml
deleted file mode 100644
index 8868ccd042b9..000000000000
--- a/games-strategy/outerspace/metadata.xml
+++ /dev/null
@@ -1,20 +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>
-	<longdescription lang="en">
-Outer Space is an on-line strategy game which takes place in the dangerous
-universe. You will become powerful commander of many stars, planets, and great
-fleets and will struggle for survival with other commanders.
-
-Outer Space communicates with the server in the same way as your browser, but
-you will need a special client to play it. Using this client you can create an
-account on the server and you can start to explore the world of the Outer Space.
-</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">ospace</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-strategy/outerspace/outerspace-0.5.68-r1.ebuild b/games-strategy/outerspace/outerspace-0.5.68-r1.ebuild
deleted file mode 100644
index ca9da045166c..000000000000
--- a/games-strategy/outerspace/outerspace-0.5.68-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit desktop gnome2-utils distutils-r1
-
-MY_PN="${PN/outerspace/Outer Space}"
-DESCRIPTION="On-line strategy game taking place in the dangerous universe"
-HOMEPAGE="https://www.ospace.net/ https://sourceforge.net/projects/ospace/"
-SRC_URI="mirror://sourceforge/ospace/Client/${PV}/Outer%20Space-${PV}.tar.gz -> ${P}.tar.gz
-	mirror://sourceforge/ospace/Client/${PV}/outerspace_${PV}-0ubuntu1_all.deb"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/pygame-1.7"
-DEPEND=""
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_unpack() {
-	default
-	unpack ./data.tar.gz
-}
-
-python_install() {
-	distutils-r1_python_install \
-		--install-scripts="/usr/bin" \
-		--install-data="/usr/share/${PN}" \
-		--install-lib="$(python_get_sitedir)"
-
-	# source tarball is missing files
-	# get them from ubuntu.deb
-	python_moduleinto ige.ospace.Rules
-	python_domodule "${WORKDIR}"/usr/share/games/outerspace/libsrvr/ige/ospace/Rules/{Tech,techs}.spf
-}
-
-src_prepare() {
-	default
-
-	# fix setup script
-	# rework python start script to avoid shell-wrapper script
-	eapply "${FILESDIR}"/${P}-setup.patch
-
-	sed -i\
-		-e "s:@GENTOO_DATADIR@:/usr/share/${PN}:" \
-		osc.py || die "sed failed"
-
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	distutils-r1_src_install
-	newicon res/logo-login.png ${PN}.png
-	make_desktop_entry "osc.py" "${MY_PN}"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index b56991727d89..3d2fa8715de9 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,9 +1,9 @@
 AUX wesnoth-1.14.7-boost-1.70.patch 914 BLAKE2B a5e4a48eb7c5ee75fb23348a396f86b8ca754f7fec1b4f4eac42e31b5956cfb56c43d6b70cdf91d12b22ad70508d3142e3f94965ae432ada1dfa7fd4931e43bb SHA512 5c37986c12ece8b11301bbf69e3b7111bf50da91157c066f954f9bf7062fe064fa7ddc9e858fa3c1413bfeb13f29a4cce63a45676c662a3d7de9e4331b88701e
 AUX wesnothd.rc-r1 511 BLAKE2B 57e8b21313e5cb677dcdac3b046caf5b1e5f690f357373c48779afa9ea969de855e8ea4849298963891d0c2b029cc1897d97d0069b5087a1496db9061a468d7f SHA512 609c3c2eb2846735610904bcc913a0db9c8daeedde77da8911ea7e85deec805ba103519785cea1c767444c46df5985c6c630ceed550085ab5527e51ff01d65ab
-DIST wesnoth-1.14.7.tar.gz 493837595 BLAKE2B a80781d4f9ec79514c6431c5d45a6cdcb913aabc6329cefe46e7980805d06b60d479110bb6432f2c35a058e551da6b6fa8e0e4f6f1bdf9a159f6329ddb74aa2a SHA512 dbca2b904147f592cc712b11d6414a47bd557d3c677e6b3eacb4fc1ca5420a264f15fdbe45c8c3469ecfb5d1ffa1ac19cceb58c1378aec0e8b4597baa348ca3b
+DIST wesnoth-1.14.11.tar.gz 500178610 BLAKE2B 27af594bc86845eedb8cd8e45c814c3583e35bd94942947f91b6fa888018ae203dbd100e01ab26b5cd59712895151049105ff446d8ad3a8b2d86133d913a92cc SHA512 3c878f679e51d3657dd4d76205bdeadd6a1a95d0771cd7ab0e29f33f36e32f1963e4a96f4529dbc4b860183b3cb5a4219e86108e0e26194b8a32d3d08a5fd469
 DIST wesnoth-1.14.9.tar.gz 497393449 BLAKE2B b5235de6ce84164ef97a105339549a8a1009d7b7ed243ae355994610e56afc584b8a37b1275e0b929729a24cd2eb94d4c208e7bd22e79b76113a1e1b91c8f92d SHA512 b3e93956a40ffc48dd02e118be1d46854a2eed34ad0dca3fb34a28d0b58b4b563cb5cca588208f3525300bf075786bebe95a25c045c8098a0bdfe531a2d81e4f
-DIST wesnoth-1.15.2.tar.gz 500575489 BLAKE2B c94ff72034f0253c3a2ceb29f10617227c407baa6365116a8cd23c70dd960d9898f5a6291235347769780798438380fe78ada8fb75b4dd83e2d2831f495360ae SHA512 c15bdc214147a222ceb2e6243a75e2dbe4f10eb6153a32c10f37b1ec163a7e0b8f6fb12747917602773fd149d23dc8a6b3ed0b0c017f44f713388743126d6b94
-EBUILD wesnoth-1.14.7.ebuild 2770 BLAKE2B f4c87e63c77aa99a71e106715f348b4acbe29bd38722d83c86511b79cdc6502f248601da622a9c17664681ccef48135a704d2538c309337dd4326fb8f33fa466 SHA512 c953fabd22d5d30adece312cba24c297ef423eb1cc55985d06f0975c20f25912882bbbd8bd85ecc84eb989ab9a22416e98eca6063bccc02d718235563f0e00e7
+DIST wesnoth-1.15.3.tar.gz 495645949 BLAKE2B aa6b8636ff1b134af5e6e9cfbefefee3189a46ccd20c2a3a3f361d77d3de48d1ae38bf8376087b6292bcacc465ad72bd60ab7aa16b3ca536ce963b6f644b8ff1 SHA512 2a5993c2c2f41939346f88104722e31a1bd0f68b39c84bdf657a7156c1348e6c65089e2766c088a2b5a2c2df8c3cd8c5cf736d66538c87cf175585634e31adbb
+EBUILD wesnoth-1.14.11.ebuild 2550 BLAKE2B d8bfc7d57d25c6bbd37cb231e5083a04a3a49e8b272e1989edee7831f5fca3a599f7ad7efb571cf8d268b163b146185bfceb930b9e4c3c7b31e355c770d37172 SHA512 2e867d9bd06be0eef6eefa9f642decb680649fa2f169e43e56c65100e62698c69dd9c24fd616f84de1795b0b98888ce5693530c7e2ac5fa40b3543404f9b31c5
 EBUILD wesnoth-1.14.9.ebuild 2588 BLAKE2B 017a50f4a8c800c038669419d13065f5102900f1852ed5f8cb6ba6a9dd4b7b2855699e71e1209850869c801a27795b1f3593eb1ac2a518e6c311095a6e9090fb SHA512 dd3053f5584fcb92d1c11340be6b8c28a69af18234a2afae0bab0cbbcb7bc839d7e5f1b95bface37a859d0c4bcb76960f876cddcc9dcda578a6e2783dace36c9
-EBUILD wesnoth-1.15.2.ebuild 2588 BLAKE2B 5e603429b0eb352c6c0aa50604646072da0461b365de03e44e5cda4f495bf60654b466e86a7c50653c2024035ed0835b1c470108cb4800dacc1d33042d7c5a71 SHA512 558e733ea2e82d0dc818e6a869ded3a2ff96f496f35345606cd38a8b0e95031aa4e3807a9a6c1d2851bc1e2e0c096d76aae10c275113105c96f137282a8b3635
+EBUILD wesnoth-1.15.3.ebuild 2550 BLAKE2B d8bfc7d57d25c6bbd37cb231e5083a04a3a49e8b272e1989edee7831f5fca3a599f7ad7efb571cf8d268b163b146185bfceb930b9e4c3c7b31e355c770d37172 SHA512 2e867d9bd06be0eef6eefa9f642decb680649fa2f169e43e56c65100e62698c69dd9c24fd616f84de1795b0b98888ce5693530c7e2ac5fa40b3543404f9b31c5
 MISC metadata.xml 485 BLAKE2B f9a78a24d1cd5ddc70fb2e8c6b9b0fa081409d99523cb9a14b890b36866576afa2ab33cb11986b364ee34aac3e4ea30f0908692ba99d56f32199860c5b65e707 SHA512 ccc12cec7aa66b59d11f65d4b8b6127c86eab2e998c31587f4323020231b55c6460d0c1fad04d7298ccdb2fe1bd9abc43e3b93716a379cbbc46f60f6bcd68ef3
diff --git a/games-strategy/wesnoth/wesnoth-1.15.2.ebuild b/games-strategy/wesnoth/wesnoth-1.14.11.ebuild
index e78b5be4d42a..f11fafb5b6da 100644
--- a/games-strategy/wesnoth/wesnoth-1.15.2.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.14.11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake user toolchain-funcs xdg
+inherit cmake toolchain-funcs xdg
 
 DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
 HOMEPAGE="http://www.wesnoth.org
@@ -19,6 +19,8 @@ fi
 IUSE="dbus dedicated doc fribidi libressl nls server"
 
 RDEPEND="
+	acct-group/wesnoth
+	acct-user/wesnoth
 	>=dev-libs/boost-1.50:=[nls,threads,icu]
 	>=media-libs/libsdl2-2.0.4:0[joystick,video,X]
 	!dedicated? (
@@ -44,11 +46,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 /bin/bash -1 ${PN}
-}
-
 src_prepare() {
 	cmake_src_prepare
 
diff --git a/games-strategy/wesnoth/wesnoth-1.14.7.ebuild b/games-strategy/wesnoth/wesnoth-1.15.3.ebuild
index b34a30910778..f11fafb5b6da 100644
--- a/games-strategy/wesnoth/wesnoth-1.14.7.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.15.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake toolchain-funcs user
+inherit cmake toolchain-funcs xdg
 
 DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
 HOMEPAGE="http://www.wesnoth.org
@@ -16,9 +16,11 @@ SLOT="0"
 if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
-IUSE="dbus dedicated doc fribidi libressl nls openmp server"
+IUSE="dbus dedicated doc fribidi libressl nls server"
 
 RDEPEND="
+	acct-group/wesnoth
+	acct-user/wesnoth
 	>=dev-libs/boost-1.50:=[nls,threads,icu]
 	>=media-libs/libsdl2-2.0.4:0[joystick,video,X]
 	!dedicated? (
@@ -44,17 +46,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=( "${FILESDIR}"/${P}-boost-1.70.patch )
-
-pkg_setup() {
-	if use openmp; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-
-	enewgroup ${PN}
-	enewuser ${PN} -1 /bin/bash -1 ${PN}
-}
-
 src_prepare() {
 	cmake_src_prepare
 
@@ -105,7 +96,6 @@ src_configure() {
 		-DENABLE_NLS="$(usex nls)"
 		-DENABLE_NOTIFICATIONS="$(usex dbus)"
 		-DENABLE_FRIBIDI="$(usex fribidi)"
-		-DENABLE_OMP="$(usex openmp)"
 		-DENABLE_STRICT_COMPILATION="OFF"
 		)
 	cmake_src_configure
diff --git a/games-strategy/widelands/Manifest b/games-strategy/widelands/Manifest
index a2203a467ebc..86c00d70204d 100644
--- a/games-strategy/widelands/Manifest
+++ b/games-strategy/widelands/Manifest
@@ -1,6 +1,6 @@
+AUX widelands-0.20-glvnd.patch 780 BLAKE2B ec09d7624e9432e9adf339efc2ce0b094d7007834e34ed6be8620fa7e9ed91bd6c4963ea452e2e769abdd521d7f679c012a2f5c5ceee9ef9f7643af6b116ac5e SHA512 9c05d8744eeacc13ec84ffda49e055fe29420a4104e7628da3a0d1c0f4e4cc4740531879c7bd88b41cb5e7ef5827c132a33c795eefedd9a4718afc738b452f05
 AUX widelands-0.20_rc1-cxxflags.patch 1060 BLAKE2B 1cc356c615037ab293877a2f65a3db2fc979ebfec370e3968da4f466873c92b523671b6e7193ae7bb1dc948b713901421586266e1837f34a19d50279f02224d9 SHA512 da3f5b9e5680c84d48740c202fd937aeb76465647b1a24e4eee5a6d3df44b2f4abda819606ff7294ee1d8fe27ceb3281e4a00ca7f03d944af933bcac0e490059
-DIST widelands-build20-rc1.tar.bz2 232490916 BLAKE2B 7dd13c325fa0dc891a5ab3cc643ae86025c5e853909d172b39d9d1cd2a41132d099f3d03349322b03dc52353f1465391ec006a83e70eb6554be133199efd96b8 SHA512 2d713db8e4a0774e8a6615b6f0dbec4f29870d69fa9bf48db8694316f7320b58ee5afa5a7796e0886471c9c787954c21f478b1364f52ce01a23212a7512465a6
 DIST widelands-build20.tar.bz2 232364340 BLAKE2B 1d8e2cd28d2ac3e2425c91a9872a3f158d7063a2c6c669d95df347561ef35dfca479fd81252d61008a3282c99a2ce70c4d904622272dd86477a731fc711306b1 SHA512 25280db6a57adeb37d13db35ce9eb41a5478534b04772240f6228c180f5a41a55fc414dab66e724945442985cbbba7a8a59a582291aca176e0bd8ae6c08760e5
-EBUILD widelands-0.20.ebuild 1534 BLAKE2B 8dd6cf5d45d89e99f13a41538806f1a7ecba87b4aadd34619a71e5e81ce4915c08a13d9863f2ffe21a0d9c1a567a49f0ccbe28e2e1c48b4f373fd63c0108630e SHA512 f0fe8fba49ba0ad0f0cdeb3fbd2ccc03eae06f8c4ea585a38254b8e47e466995394f8f5d8012e7f7ff3673e7d4ac2df93f4a0bf87428f3e91cd98448a6754f4b
-EBUILD widelands-0.20_rc1.ebuild 1540 BLAKE2B b97b42a215817bdf119baee64fd83a47f600859efde3e90e7d62a3032899d6c7e056574d909140d9eb4ae63c39eba425a8e33085dea4e9e2097a5b96146c0691 SHA512 8f8d78b9cc7c7a698c255dcbda48c788bda5976a559567f736cd7f5d5b6279fab2505e69b5953e9e2439e7583aa8ccfaa383ac2292971871b63ee93c59899cb6
+EBUILD widelands-0.20-r1.ebuild 1628 BLAKE2B acf5bc94c7b8134dc27df70ff0c21e2e3dd8ee2b3a112a00b61e84ff96c20ea11b7444a9b1a1b451c059e5d22b243b4ee355f788b9a9ce541c45cb8114a3542c SHA512 47a5d7362e30b7d2af157d0c95df4e084c80f17713232f5f678561b0d3d845fc90c36a7f631c9491967d0625e2150a1e8a118990b407b37112cb82b6ce1eb983
+EBUILD widelands-9999.ebuild 2147 BLAKE2B cbb3bebf0d529ff2c4e1abb9e880ca25f35f627651fda3c2e2ade59da3056affa43a844784f9d9fca53bfbc3938836bbdcbdfb1e17f7be6de4d655f3ba947c1d SHA512 2916a379a5feeeb1cf98c527f0fe514501c461c6777a086fd8710bf263915af08f5c8d266f0ece0b82fc2126571fcef210253e1f56dc98a54905b86a530a0a5b
 MISC metadata.xml 330 BLAKE2B 40ce3c95a2be4fd32bc1d9cc214fb4a61435b869c5d0c6406094ddab24a1e4a7b64f28b866e4c712d1d7020a047f28a239e9b8d51092242f2a43269d13934cc4 SHA512 a56671f43b3ce3e6274b9101b7c5ea1a4b2ff261fb94366e80d2655519a07c52fa0629b762d3ca76f82693075a1c717795bff2a69122938c9749ea249dc1e75d
diff --git a/games-strategy/widelands/files/widelands-0.20-glvnd.patch b/games-strategy/widelands/files/widelands-0.20-glvnd.patch
new file mode 100644
index 000000000000..94d1aa3850c7
--- /dev/null
+++ b/games-strategy/widelands/files/widelands-0.20-glvnd.patch
@@ -0,0 +1,25 @@
+From 4661768699c4651df1668fbfe0e24bb02bf10db1 Mon Sep 17 00:00:00 2001
+From: franku <somal@arcor.de>
+Date: Thu, 18 Jul 2019 19:30:34 +0200
+Subject: [PATCH] use link_libraries instead of set(CMAKE_EXE_LINKER_FLAGS...
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5c5ca8a60b..bcff2db2ff 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -181,7 +181,7 @@ endif(OPTION_ASAN)
+ 
+ # This is set to avoid linker errors when using GLVND-libs on Linux
+ if("${OpenGL_GL_PREFERENCE}" STREQUAL "GLVND")
+-   set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lGL")
++   link_libraries("GL")
+    add_compile_definitions(WL_USE_GLVND)
+    message(STATUS "Adding linker flags for GLVND.")
+ endif()
+-- 
+2.25.1
+
diff --git a/games-strategy/widelands/widelands-0.20.ebuild b/games-strategy/widelands/widelands-0.20-r1.ebuild
index 366325c6dfe0..335598744fef 100644
--- a/games-strategy/widelands/widelands-0.20.ebuild
+++ b/games-strategy/widelands/widelands-0.20-r1.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=7
 
-inherit desktop cmake
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit desktop cmake python-any-r1
 
 MY_PV="build$(ver_cut 2-)"
 MY_P="${PN}-${MY_PV/_/-}"
@@ -18,19 +20,21 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
-	dev-lang/lua:0
-	dev-libs/icu:=
 	>=dev-libs/boost-1.48:=
+	dev-libs/icu:=
 	media-libs/glew:0=
+	media-libs/libglvnd
 	media-libs/libpng:0=
 	media-libs/libsdl2[video]
-	media-libs/sdl2-gfx
 	media-libs/sdl2-image[jpeg,png]
 	media-libs/sdl2-mixer[vorbis]
-	media-libs/sdl2-net
 	media-libs/sdl2-ttf
 	sys-libs/zlib:=[minizip]"
 DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-lang/lua:0
+"
+BDEPEND="
 	sys-devel/gettext
 "
 
@@ -40,6 +44,7 @@ S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.20_rc1-cxxflags.patch"
+	"${FILESDIR}/${PN}-0.20-glvnd.patch"
 )
 
 src_prepare() {
diff --git a/games-strategy/widelands/widelands-0.20_rc1.ebuild b/games-strategy/widelands/widelands-0.20_rc1.ebuild
deleted file mode 100644
index 52af37a24664..000000000000
--- a/games-strategy/widelands/widelands-0.20_rc1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop cmake
-
-MY_PV="build$(ver_cut 2-)"
-MY_P="${PN}-${MY_PV/_/-}"
-
-DESCRIPTION="A game similar to Settlers 2"
-HOMEPAGE="http://www.widelands.org/"
-SRC_URI="https://launchpad.net/widelands/build$(ver_cut 2)/${MY_PV/_/-}/+download/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-lang/lua:0
-	dev-libs/icu:=
-	>=dev-libs/boost-1.48:=
-	media-libs/glew:0=
-	media-libs/libpng:0=
-	media-libs/libsdl2[video]
-	media-libs/sdl2-gfx
-	media-libs/sdl2-image[jpeg,png]
-	media-libs/sdl2-mixer[vorbis]
-	media-libs/sdl2-net
-	media-libs/sdl2-ttf
-	sys-libs/zlib:=[minizip]"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
-
-CMAKE_BUILD_TYPE="Release"
-
-S="${WORKDIR}/${MY_P/20/19}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.20_rc1-cxxflags.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -i -e 's:__ppc__:__PPC__:' src/map_io/s2map.cc || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DOPTION_BUILD_WEBSITE_TOOLS=OFF
-
-		# Upstream's cmake files are totally fscked up...
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr/share/doc/${PF}
-		# Game is NOT happy being moved from /usr/share/games
-		-DWL_INSTALL_DATADIR="${EPREFIX}"/usr/share/games/${PN}
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# move game binary to correct location
-	dodir /usr/bin
-	mv "${ED}"/usr/share/doc/${PF}/${PN} "${ED}"/usr/bin || die
-
-	newicon data/images/logos/wl-ico-128.png ${PN}.png
-	make_desktop_entry ${PN} ${PN^}
-}
diff --git a/games-strategy/widelands/widelands-9999.ebuild b/games-strategy/widelands/widelands-9999.ebuild
new file mode 100644
index 000000000000..2c2694479039
--- /dev/null
+++ b/games-strategy/widelands/widelands-9999.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit cmake python-any-r1 xdg
+
+MY_PV="build$(ver_cut 2-)"
+MY_P="${PN}-${MY_PV/_/-}"
+
+DESCRIPTION="A game similar to Settlers 2"
+HOMEPAGE="http://www.widelands.org/"
+
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/widelands/widelands.git"
+else
+	SRC_URI="https://launchpad.net/widelands/build$(ver_cut 2)/${MY_PV/_/-}/+download/${MY_P}.tar.bz2"
+	S="${WORKDIR}/${MY_P}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/boost-1.48:=
+	dev-libs/icu:=
+	media-libs/glew:0=
+	media-libs/libglvnd
+	media-libs/libpng:0=
+	media-libs/libsdl2[video]
+	media-libs/sdl2-image[jpeg,png]
+	media-libs/sdl2-mixer[vorbis]
+	media-libs/sdl2-ttf
+	sys-libs/zlib:=[minizip]"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-lang/lua:0
+"
+BDEPEND="
+	sys-devel/gettext
+"
+
+CMAKE_BUILD_TYPE="Release"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.20_rc1-cxxflags.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -i -e 's:__ppc__:__PPC__:' src/map_io/s2map.cc || die
+	# don't call gtk-update-icon-cache
+	sed '/^find_program(GTK_UPDATE_ICON_CACHE/d' \
+		-i xdg/CMakeLists.txt || die
+}
+
+src_configure() {
+	local WLDIR="${EPREFIX}/usr/share/${PN}"
+	local mycmakeargs=(
+		-DOPTION_BUILD_WEBSITE_TOOLS=OFF
+
+		# -DUSE_XDG=ON breaks finding of datadir
+		-DUSE_XDG=OFF
+
+		# Upstream's cmake files are totally fscked up...
+		# This just helps dealing with less crap in src_install
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DWL_INSTALL_BASEDIR="${WLDIR}"
+		-DWL_INSTALL_DATADIR="${WLDIR}/data"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# upstream CMakeLists.txt file is totally bonkers
+	local sharedir="${ED}/usr/share"
+	dodir /usr/bin
+	mv "${ED}"/usr/${PN} "${ED}"/usr/bin || die
+	mv "${ED}"/share/* "${sharedir}" || die
+	rmdir "${ED}"/share || die
+	rm "${sharedir}"/${PN}/{COPYING,CREDITS,ChangeLog} || die
+	mv "${sharedir}"/${PN}/VERSION "${sharedir}"/doc/${PF}/ || die
+
+	#newicon data/images/logos/wl-ico-128.png ${PN}.png
+	#make_desktop_entry ${PN} ${PN^}
+}