gentoo resync : 25.08.2020

28 files changed, 227 insertions, 799 deletions

diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index 1f9b81012783..c05bf564dc7e 100644
--- a/games-action/Manifest.gz
+++ b/games-action/Manifest.gz
diff --git a/games-action/astromenace/Manifest b/games-action/astromenace/Manifest
index 4ccb8b3d4cce..4e81a54a0ba1 100644
--- a/games-action/astromenace/Manifest
+++ b/games-action/astromenace/Manifest
@@ -1,5 +1,3 @@
-DIST astromenace-1.3.2.tar.gz 64643636 BLAKE2B f3b7dfbeeed56eab8946e122bebf98baa37b7a3e4291007d4f0bb12a220c26ded063f51fcd6f529c9f00cd4b6172d37dcb0798d41e553c682556ba7f4243bce7 SHA512 dd24dc80e0a6b1d47a5e6874ee8aac58790518ef7a910573b6fd7a71541cd811774a8607e6c175c51fb03983d0799db7acbafb79b167dee3bdb79ff6168c1451
 DIST astromenace-1.4.1.tar.gz 68041500 BLAKE2B a6e0c98feae200440bc3e3bd0e3338325ce7953f4e4241d69e1d3b6cc3aaef54c1966f62b08a27aef2a6f6b1ee028e8c7c78788aabc2622bcc1eeab10186c428 SHA512 408fd8a9fcc51d0cdfd31d77bc1c05b079b3248622a252e73e1145db9715b3a331eef5fde295c3390143fb7bb2f88460d374eddea719b6452577bf5e83bd14c1
-EBUILD astromenace-1.3.2-r1.ebuild 1480 BLAKE2B b4410c0f25f4357834bf4a545f7809640eb3eee05b64b0c7d153d5bcf8ce76fb3bee7d9bbe84077d79fc738c788d3a57e31cc72e10a4d8e6af52e8a933e0c562 SHA512 e3e6958cb3f220367b107d8525e7b46f1b73395f03021f10dac625474a16894d4658f1435dcf2111be3bb240983175169fd0d7ea9f69957ad45438a1c7f40ba1
-EBUILD astromenace-1.4.1.ebuild 1313 BLAKE2B a7e07dd22cb83b865a41254f5b8970b64f7c4cb174a12013a552f3246cfdd62da25dd341d8a00847171e42e90a13bb71918c32b482e82e41f3023a73abbef6a4 SHA512 adc0bce2292bc3b5d404f05b4e37d0c4fe0df9452974a2f6174741cf47936278f1dc865a97bd1641f1e2f3110ce6bcc9e2881f3442d948fed96a39bc19cf9e4b
+EBUILD astromenace-1.4.1-r1.ebuild 1276 BLAKE2B 9f92f146909dd5fb3f3859de671c9f080b1f8494f9e02ff4b8be586f6acde13d097f1dcdeb85d1f131f51bba33c4759e12e3e071731991d269915a73cbecf8a9 SHA512 fc5159f04aa9ff26abe8776a7e8b8aa3449e7a4063515d0ecf54a46d472c6ca9f520201a7785a433a284a1fc7b5669276660845215242a7ccbf8782e8a591c04
 MISC metadata.xml 338 BLAKE2B 6c318ab57a89bd4e1ae46723bf6d0a64e7ef78f8507dabbfb8a0ff3f39b58ce5642f04e2d65d93722d74a4783b67fe860513785a12098aa7ee03f8d7df2054f6 SHA512 b2364e10d11ba13a39560816a4b7bc99bd00eb5917e81842a909813cd0fe55bb5324baf4181238fcd1122508bde58f2f0d064c6d6cf52401bc7a76372c6e6e44
diff --git a/games-action/astromenace/astromenace-1.3.2-r1.ebuild b/games-action/astromenace/astromenace-1.3.2-r1.ebuild
deleted file mode 100644
index 66ea563b64ba..000000000000
--- a/games-action/astromenace/astromenace-1.3.2-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils desktop gnome2-utils
-
-DESCRIPTION="Hardcore 3D space scroll-shooter with spaceship upgrade possibilities"
-HOMEPAGE="https://viewizard.com"
-SRC_URI="https://github.com/viewizard/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3 GPL-3+ CC-BY-SA-3.0 UbuntuFontLicense-1.0 OFL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	media-libs/freealut
-	media-libs/freetype:2
-	media-libs/libogg
-	media-libs/libsdl[joystick,video,X]
-	media-libs/libvorbis
-	media-libs/openal
-	virtual/glu
-	virtual/opengl
-	x11-libs/libXinerama"
-RDEPEND=${DEPEND}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# no messing with CXXFLAGS please.
-	sed -i -e '/-Os/d' CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=("-DDATADIR=/usr/share/${PN}")
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	"${CMAKE_BUILD_DIR}"/AstroMenace --pack \
-		--rawdata="${S}"/RAW_VFS_DATA \
-		--dir=$(dirname "${CMAKE_BUILD_DIR}") || die
-}
-
-src_install() {
-	newbin "${CMAKE_BUILD_DIR}"/AstroMenace "${PN}"
-
-	insinto /usr/share/${PN}
-	doins ../*.vfs
-
-	newicon -s 128 astromenace_128.png ${PN}.png
-	newicon -s 64 astromenace_64.png ${PN}.png
-
-	dodoc ChangeLog.txt ReadMe.txt
-
-	make_desktop_entry "${PN}" AstroMenace
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-action/astromenace/astromenace-1.4.1.ebuild b/games-action/astromenace/astromenace-1.4.1-r1.ebuild
index 3300882e709e..99cca3528267 100644
--- a/games-action/astromenace/astromenace-1.4.1.ebuild
+++ b/games-action/astromenace/astromenace-1.4.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils desktop xdg-utils
+inherit cmake desktop xdg-utils
 
 DESCRIPTION="Hardcore 3D space scroll-shooter with spaceship upgrade possibilities"
 HOMEPAGE="https://viewizard.com"
@@ -14,19 +14,20 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="media-libs/freealut
+DEPEND="
+	media-libs/freealut
 	media-libs/freetype:2
 	media-libs/libogg
-	media-libs/libsdl[joystick,video,X]
+	media-libs/libsdl2[joystick,video]
 	media-libs/libvorbis
 	media-libs/openal
 	virtual/glu
 	virtual/opengl
 	x11-libs/libXinerama"
-RDEPEND=${DEPEND}
+RDEPEND="${DEPEND}"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# no messing with CXXFLAGS please.
 	sed -i -e '/-Os/d' CMakeLists.txt || die
@@ -35,11 +36,11 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=( -DDATADIR="${EPREFIX}/usr/share/${PN}" )
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 }
 
 src_install() {
@@ -51,7 +52,7 @@ src_install() {
 	newicon -s 128 share/astromenace_128.png ${PN}.png
 	newicon -s 64 share/astromenace_64.png ${PN}.png
 
-	dodoc CHANGELOG.md README.md
+	einstalldocs
 
 	make_desktop_entry "${PN}" AstroMenace
 }
diff --git a/games-action/heroes/Manifest b/games-action/heroes/Manifest
index 7ac79048b74e..241b69557ecc 100644
--- a/games-action/heroes/Manifest
+++ b/games-action/heroes/Manifest
@@ -1,12 +1,11 @@
-AUX heroes-0.21-automake-1.12.patch 335 BLAKE2B 6c2d757313999dfce5d9fc4b2b4ded76bad6b89e45777910de8cef441590015fa37491594a6989a0da29fb70e636fc5b1c1a3bbba56bd371cb6ba1226d2620f7 SHA512 9c40b9b0bd4e82f3f9bd9b66c455e834bd1b2a91e79dd550fd4aada4ca1b6e2ecb55353f31cad1a021a28dfc3781afb1f040545bf8030b0e63b988708aae480d
+AUX heroes-0.21-autotools.patch 823 BLAKE2B 4d8e6ffd49598c93dfe160f60a7ac1e7d62b8986cf8b41221227f6d4042ebbe654b3e7d501d0dc172113cd36f94a7ac4971d7dc30a175215ac6d2e11cfec3af7 SHA512 1feb7db06a8d14213b1dc121aff612b959813af20ad1be7d2248b0a99095cb04d55249b45a6d0774e737e2d55d598be53a93dc95375515cbf2621fd74581facf
 AUX heroes-0.21-compilation.patch 850 BLAKE2B d5a372906082794c686de7eb560a1f7da6790f73e7c5cb2cb4331fa8cf95999e4417c56e9043463452a1bd0e8d339fa0ff954e3de6d4f1ad7666e41b17443757 SHA512 d8214ddf3a9167a13eb51eeaa0b4c6f4e2d319c69a32d6ce77ca7ebbd19284312613d3d59c4393051ed1e8e119778e947f96e692e133bb0eae0e74e07fe1822a
 AUX heroes-0.21-cvs-segfault-fix.patch 551 BLAKE2B 0a09409c97d252878cb3841b6c6ab95b4dea3b91aa6c6b81d84adc263bcee1629e0f7856ef9ddda3ba718a02aec8beab3c16cab06a76192e7081ee8be9c447a5 SHA512 4ccce0f50a5f2128809d8fa759b4dcdd002443ecf6d35ebd72a46e1feb0461150535c462e674156c9f8550578ea4b66d3c87aee74c3bbdfe756a96caa54bdde1
 AUX heroes-0.21-gcc10.patch 528 BLAKE2B c14fc4995fbebce2a0053632e8f4392d265b6ed6ecc99f1e019e9f9c07f07392315593fe2f207acfb69b382ae22ae34bec2ff66531b1f4356503f3eb7285be35 SHA512 96c94fed186469d6c38fcf6fda400880a546e0d95bf26cb2725d9ec86b4732bd25c37de79d3f0b6830c199b3486966393704fe6710ac55ad85d89bbdd12e1967
 AUX heroes-0.21-gcc4.patch 6016 BLAKE2B a99603890ca5f7c23ca3286faea125b31c6b2eb7039b2f830cfe5d257f95960d83680a7e4a7153118ac21e9e84a7b57f8b0996e5665c27569261822f51bb9c47 SHA512 ab72c9f501458a493458d92140286ed3ffdc1b5dc767343ce60354f6b1ded90fb8b25f914f4bbaea68fa29ef9870c2534038e44a92f84f01e1538c1f6b450b31
-AUX heroes-0.21-underlink.patch 476 BLAKE2B 8e9b2892d82dd5c5b170ad1fda88766aae11955b94cf076aa6140ea781e1af314052b327b0142370b8779e5a8ed797f1148e79664f284c93c5f6921262ebda10 SHA512 6d5db649f4f1d0d7994e4fe1d6e5738276ada879ecd192be88b3dbdf900fe6991fce4fe05c52f075d0159cfab7cfd6728be322ba9f7e73556b61f43e5f9a52db
 DIST heroes-0.21.tar.bz2 709079 BLAKE2B 356c7c97504c5abe6c9e94a9ba190613d199000c5f2c0dd23b8517d8e9a8b7ea81b013472af4abaf5ab2519618772e5b657281fe2dc835d3882cf788f020cad8 SHA512 fc0ac1fdf7e686388c90162b6cd76d638d295fa5919a9fdd4e944a85ca4f60b1b0a01873820b2c718ae9c960ca3d7e28ec62c09d6cd0f052e62fd2e76a96be82
 DIST heroes-data-1.5.tar.bz2 391970 BLAKE2B b4325e978955ad6cfe522055755ebcc0ff487a9fdc136dbeaea30073f450d50946859d61cf44f75ab89be556e0886f8cb6ff3623c84c3275194ac81e60b1d0f9 SHA512 a4cb1508c2010b2157dc0e1d0a7973131fa167cb1f3c93649c3bc9b2c37419e4429e33cde14f3b67c7a4670f751ff4c28d88604102780bdb1fe5c77a93e1a213
 DIST heroes-sound-effects-1.0.tar.bz2 389883 BLAKE2B cd4e889bf7e0b33eda33806040d3141576d60b93332d6c4bf7d41fd587bb9d661ded4f619e313e17d8508500e138f7f3ce08b9336818f85d9e240d2fdebaf4e2 SHA512 51da63373f1bdb2314a8c3164028ee9cbb95958bfe8f13b1119236f035282a711efcc6ef5a84fd647c1e8451b4da788a74e4b8506e1476a437299dfc7b2046d1
 DIST heroes-sound-tracks-1.0.tar.bz2 1245613 BLAKE2B b390a96065c6b127addc0bc25326c8d0055b13f896d33e765ab9a5b3c45d831c0f91e1cff361f43a2b4956e87a6a980ce2cd07d6e6588357038f92805c64dbd1 SHA512 3e7ee2890c47366a39cfc7d7b9a1e5fdf3c3379013ca96072586ba909e2a602b114c728ffbe9dfe8eb6b62232cb6c25b13475f2a33da0243ea1ffb3f040842f0
-EBUILD heroes-0.21-r2.ebuild 1677 BLAKE2B 4ba431551a6b225f8a790a138327f30a49e093727fb344877014836439c8f3feac730de86f4060b1298d7e7e853754317448d86d2bb721d3bfa1dd1556afc19d SHA512 f7f8161a12c89993ec8ce5dc4cadb6a2ea7ce2242c6cce0a7f398730cc38b1e1e6b1758327e1bac7579b375aaf3cebccdce3387e2a67936d126a30d9f34d30eb
+EBUILD heroes-0.21-r2.ebuild 1542 BLAKE2B d3e59ea72325b58f00aef689c05c4c57ecf767f28908b650494a72bdd26b0f44ee2de912bbf59e825acc18121d3ce6bcdae09bd0ae68a5c53c7388d5c17e13b4 SHA512 7e7c01995b2325f4c05b45c12060aaa9806e1046921462badb01afff8dddb2de34d5e85e8d750417ec00fd0de842c8bc3fbcdf84571b6827ce734f515a1fa182
 MISC metadata.xml 329 BLAKE2B 3d95771553c911350c23023422240c0a791ede2044a55bf40a25ac4c5ac84114ddb2942b370b9605a966d4dac960b1498f278394925d065bee642164f4893187 SHA512 f33d2b7d06f5e772abf4acb8b3dc8ba78b52ab8220a350ddc64d8bde67e850062830b4251f13021b8472b110602c937cfdc3fd34c97c37ba455542b771ecb872
diff --git a/games-action/heroes/files/heroes-0.21-automake-1.12.patch b/games-action/heroes/files/heroes-0.21-automake-1.12.patch
deleted file mode 100644
index 1a645df91acb..000000000000
--- a/games-action/heroes/files/heroes-0.21-automake-1.12.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- heroes-0.21/configure.ac
-+++ heroes-0.21/configure.ac
-@@ -112,7 +112,7 @@
- # Checks for typedefs, structures, and compiler characteristics.
- # ==============================================================
- 
--AM_C_PROTOTYPES
-+AC_C_PROTOTYPES
- AC_C_CONST
- AC_TYPE_UID_T     dnl This checks for gid_t too.
- AC_CHECK_TYPES([ssize_t])
diff --git a/games-action/heroes/files/heroes-0.21-autotools.patch b/games-action/heroes/files/heroes-0.21-autotools.patch
new file mode 100644
index 000000000000..c6dfb9fab1a7
--- /dev/null
+++ b/games-action/heroes/files/heroes-0.21-autotools.patch
@@ -0,0 +1,30 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -44,6 +44,7 @@
+ AM_PROG_CC_C_O
+ AC_PROG_CPP
+ AC_PROG_AWK
++AM_PROG_AR
+ AC_PROG_RANLIB
+ AC_PROG_LN_S
+ 
+@@ -112,7 +113,7 @@
+ # Checks for typedefs, structures, and compiler characteristics.
+ # ==============================================================
+ 
+-AM_C_PROTOTYPES
++AC_C_PROTOTYPES
+ AC_C_CONST
+ AC_TYPE_UID_T     dnl This checks for gid_t too.
+ AC_CHECK_TYPES([ssize_t])
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -42,7 +42,7 @@
+ heroeslvl_SOURCES = heroeslvl.c
+ 
+ heroes_LDADD = lvl/libhlvl.a media/libhmcommon.a ../lib/libheroes.a \
+-	       $(INTLLIBS) $(LIBALT_LOCAL_XLDADD) $(LIBALT_XLDADD)
++	       $(INTLLIBS) $(LIBALT_LOCAL_XLDADD) $(LIBALT_XLDADD) -lm
+ heroes_LDFLAGS = $(LIBALT_XLDFLAGS)
+ 
+ ## Depend upon Makefile because the value of LIBALT_LOCAL_LDADD might
diff --git a/games-action/heroes/files/heroes-0.21-underlink.patch b/games-action/heroes/files/heroes-0.21-underlink.patch
deleted file mode 100644
index 18a0fca28f3c..000000000000
--- a/games-action/heroes/files/heroes-0.21-underlink.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/Makefile.am	2011-06-10 11:32:03.905618275 +0200
-+++ b/src/Makefile.am	2011-06-10 11:32:15.539347083 +0200
-@@ -42,7 +42,7 @@
- heroeslvl_SOURCES = heroeslvl.c
- 
- heroes_LDADD = lvl/libhlvl.a media/libhmcommon.a ../lib/libheroes.a \
--	       $(INTLLIBS) $(LIBALT_LOCAL_XLDADD) $(LIBALT_XLDADD)
-+	       $(INTLLIBS) $(LIBALT_LOCAL_XLDADD) $(LIBALT_XLDADD) -lm
- heroes_LDFLAGS = $(LIBALT_XLDFLAGS)
- 
- ## Depend upon Makefile because the value of LIBALT_LOCAL_LDADD might
diff --git a/games-action/heroes/heroes-0.21-r2.ebuild b/games-action/heroes/heroes-0.21-r2.ebuild
index 9e7f8d9fcc0d..a576ebf8f758 100644
--- a/games-action/heroes/heroes-0.21-r2.ebuild
+++ b/games-action/heroes/heroes-0.21-r2.ebuild
@@ -20,10 +20,11 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="ggi nls sdl"
+REQUIRED_USE="^^ ( ggi sdl )"
 RESTRICT="test"
 
-REQUIRED_USE="^^ ( ggi sdl )"
-RDEPEND="ggi? (
+RDEPEND="
+	ggi? (
 		media-libs/libggi
 		media-libs/libgii
 		media-libs/libmikmod
@@ -33,49 +34,41 @@ RDEPEND="ggi? (
 		media-libs/libsdl
 		media-libs/sdl-mixer
 	)"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
 
-	#56118
 PATCHES=(
-	"${FILESDIR}/${P}"-automake-1.12.patch
-	"${FILESDIR}/${P}"-gcc4.patch
-	"${FILESDIR}/${P}"-underlink.patch
-	"${FILESDIR}/${P}"-cvs-segfault-fix.patch
-	"${FILESDIR}/${P}"-compilation.patch
-	"${FILESDIR}/${P}"-gcc10.patch
+	"${FILESDIR}"/${P}-autotools.patch
+	"${FILESDIR}"/${P}-gcc4.patch
+	"${FILESDIR}"/${P}-cvs-segfault-fix.patch
+	"${FILESDIR}"/${P}-compilation.patch
+	"${FILESDIR}"/${P}-gcc10.patch
 )
 
 src_prepare() {
 	default
-	sed -i 's:$(localedir):/usr/share/locale:' \
-		$(find . -name 'Makefile.in*') || die
 	eautoreconf
 }
 
 src_configure() {
-	local myconf=(
-		$(use_with sdl)
-		$(use_with sdl sdl-mixer)
-		$(use_with ggi)
-		$(use_with ggi mikmod)
-		$(use_enable nls)
-	)
-
 	local pkg
-	for pkg in ${A//.tar.bz2} ; do
-		cd "${WORKDIR}"/${pkg}
+	for pkg in ${A//.tar.bz2}; do
+		cd "${WORKDIR}"/${pkg} || die
 		econf \
 			--disable-heroes-debug \
 			--disable-optimizations \
-			"${myconf[@]}"
+			$(use_with sdl) \
+			$(use_with sdl sdl-mixer) \
+			$(use_with ggi) \
+			$(use_with ggi mikmod) \
+			$(use_enable nls)
 	done
 }
 
 src_install() {
 	local pkg
 	for pkg in ${A//.tar.bz2} ; do
-		cd "${WORKDIR}"/${pkg}
+		cd "${WORKDIR}"/${pkg} || die
 		emake DESTDIR="${D}" install
 	done
 }
diff --git a/games-action/koth/Manifest b/games-action/koth/Manifest
index f7ccf1659781..7fd79394ea24 100644
--- a/games-action/koth/Manifest
+++ b/games-action/koth/Manifest
@@ -1,4 +1,5 @@
-AUX koth-0.8.0-r1-gcc-3.4.patch 628 BLAKE2B e62daab926595507618cc9215612bd11bd901218448cf2a192023ddbd4c13fce70a49f853a50df628adb12c077cd6597b22cbafb67e1ca42394d90defbab6676 SHA512 ca6bfe40d9ab0a08bae833684628422d2b69047ec4aa80df43e0c093184680f8d202180f0ae3d89099b4c45aa481ac28055a1a5deb5afb69e8c397508e46e08e
+AUX koth-0.8.0-autotools.patch 467 BLAKE2B be5f9342bf18bbe292ae4b2f89d94011b81e88e8c80e37aa8da8f39db546a93dd106aa423a09b2b276b6226df09b8eed9c2a5dba9460adff0d75b1e4aaaed65f SHA512 4e3aa06f1dd73505ba4e1ac084e8d71999f41bb6823179cdf3224cc29d976d80b857aac9e0051b70ea27148cb9923a37bf1f29ea8fb763e60c36865ea7c14384
+AUX koth-0.8.0-gcc.patch 1415 BLAKE2B c9ae5cd2e138a0de64f102d39e11328c7353d7114ca8a102559546345a0f7b23b5f5b6f68d6bf6ad6505c877cbe6e7e8279aa3092e32fcf79a20da0006fbfda9 SHA512 382d47fc3c967d461c72ac63668ff32b4ed597cd367301e10fa2cfc89ff672be78427e653af7e29b5aaeb56056740233b2c8743802c74070a800b956e609e3a5
 DIST koth-0.8.0.tar.bz2 140569 BLAKE2B cfcbba838238fbe45bccc800c258290531341623d4a57825f389a01278febe3b99d9459f4294cea9f4520c0dc76ad945266640c89687ab0b77a5348d2b88685a SHA512 edda377be9074298c63e85cad5f37f55dc67f0e9a7d075a94207559265ffbf8a5eadbd2dc0e4a06e535e6da9fcfd309d01141ba8be04cf8960b0229e0ce4ab9f
-EBUILD koth-0.8.0-r1.ebuild 828 BLAKE2B 14d101e06a6a5335fa74bf1a539af2e840df09a5f7921401ebd6fcf980a0aef1e7a52e665ad25db51cb0e06e819f167f5b1bef04192d5410a81e7ab06f1433b2 SHA512 80f209fc59b29c54f13d7fe951841b2be96cd81d6204caa6597cc4ff2c84e3c8f42f29ec9dd5893e2a6519e354edb0473338a4b3afd0b372f467ab767b1e33e0
+EBUILD koth-0.8.0-r1.ebuild 675 BLAKE2B 27900ac6455fac60b0ddd19c33f82c1d2a2090795ae46388746d69d6c2cee92166f86123a3f65d38b14ae370f56cba5c85b815defe8e103f9d34abc482ffa65c SHA512 5809786260ca8abda3e772800da94633f53865c0c42d321b5623ce11a6d2e519216cb5c386ed26ad59a3a710aa0df5a16f70a9a2fa14a59592469e4bebdfd239
 MISC metadata.xml 562 BLAKE2B f5d44dfcf5ed0fa77163ea4ac24d010fe3236130fb0dce1c68b8cb5804e6a5cd088a3b0d14bc573279ed23165d829a2f49516123e57158fd054469271bb20bd5 SHA512 c9bf2b0f6d97e56b9b8d3667fecd9a18bc971f2a396c7bb9a2904ea3e86eec4b625ff73630b4c6a45eea30418e8cfd8b3774a699e45b98b4e44bbb205365d333
diff --git a/games-action/koth/files/koth-0.8.0-autotools.patch b/games-action/koth/files/koth-0.8.0-autotools.patch
new file mode 100644
index 000000000000..0303a0e0bec6
--- /dev/null
+++ b/games-action/koth/files/koth-0.8.0-autotools.patch
@@ -0,0 +1,20 @@
+--- a/configure.in
++++ b/configure.in
+@@ -4,15 +4,14 @@
+ AM_CONFIG_HEADER(config.h)
+ AC_PROG_MAKE_SET
+ 
+-USER_CFLAGS=$CFLAGS
+-
+ dnl Checks for programs.
+ AC_PROG_CC
+ AC_ISC_POSIX
++AM_PROG_AR
+ AC_PROG_RANLIB
+ 
+ 
+-CFLAGS="-g -O2 -Wall -Wimplicit $USER_CFLAGS"
++CFLAGS="${CFLAGS} -Wall -Wimplicit"
+ dnl Checks for library functions.
+ AC_ARG_ENABLE(client, [  --disable-client        disable libggi detection (can only build server)],
+ 			if test $enableval == no; then 
diff --git a/games-action/koth/files/koth-0.8.0-gcc.patch b/games-action/koth/files/koth-0.8.0-gcc.patch
new file mode 100644
index 000000000000..999498da7005
--- /dev/null
+++ b/games-action/koth/files/koth-0.8.0-gcc.patch
@@ -0,0 +1,72 @@
+--- a/src/ballistics.c
++++ b/src/ballistics.c
+@@ -92,6 +92,7 @@
+ 	    break;
+ 	case WALL_LAST:
+ 	    /* just to satisfy gcc -Wall */
++	    ;
+     }
+ }
+ 
+@@ -210,7 +211,7 @@
+ 		break;
+ 	    case WALL_RANDOM:	/* both of this can't happen, */
+ 	    case WALL_LAST:	/* so they are here to satisfy gcc -Wall */
+-
++	    	;
+ 	}
+     }
+     return FLYING;
+--- a/src/gfx.c
++++ b/src/gfx.c
+@@ -51,7 +51,7 @@
+ int gfx_armorBar=0;
+ 
+ /* The maximum value for a color. */
+-#define CMAX ((uint16)(~0))
++#define CMAX ((uint16_t)(~0))
+ #define MAX(a, b)  (((a) > (b)) ? (a) : (b))
+ #define MIN(a, b)  (((a) < (b)) ? (a) : (b))
+ 
+--- a/src/gfx.h
++++ b/src/gfx.h
+@@ -24,7 +24,7 @@
+ #include "terrain.h"
+ 
+ /* The maximum value for a color. */
+-#define CMAX ((uint16)(~0))
++#define CMAX ((uint16_t)(~0))
+ #define MAX_WALLS 6
+ 
+ extern ggi_visual_t gfx_vis;
+--- a/src/log.c
++++ b/src/log.c
+@@ -26,7 +26,7 @@
+ 
+ Levels_log log_level = INTERESTING;
+ 
+-inline void logPrintf(Levels_log level, char *fmt, ...)
++void logPrintf(Levels_log level, char *fmt, ...)
+ {
+     if(log_level < level)
+ 	return;
+--- a/src/log.h
++++ b/src/log.h
+@@ -25,6 +25,6 @@
+ 
+ extern Levels_log log_level;
+ 
+-inline void logPrintf(Levels_log level, char *fmt, ...);
++void logPrintf(Levels_log level, char *fmt, ...);
+ 
+ #endif
+--- a/src/relay.c
++++ b/src/relay.c
+@@ -260,6 +260,7 @@
+ 		    else goto bail;
+ 		    goto nextpkt;
+ 		bail:
++		    ;
+ 		}
+ 	    }	
+ 	}
diff --git a/games-action/koth/files/koth-0.8.0-r1-gcc-3.4.patch b/games-action/koth/files/koth-0.8.0-r1-gcc-3.4.patch
deleted file mode 100644
index 145f17dbccdd..000000000000
--- a/games-action/koth/files/koth-0.8.0-r1-gcc-3.4.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/src/relay.c	2004-11-01 09:19:04.835537536 +0000
-+++ b/src/relay.c	2004-11-01 09:19:59.453234384 +0000
-@@ -260,6 +260,7 @@
- 		    else goto bail;
- 		    goto nextpkt;
- 		bail:
-+		    ;
- 		}
- 	    }	
- 	}
---- a/src/ballistics.c	2004-11-01 09:19:33.132235784 +0000
-+++ b/src/ballistics.c	2004-11-01 09:20:16.849589736 +0000
-@@ -92,6 +92,7 @@
- 	    break;
- 	case WALL_LAST:
- 	    /* just to satisfy gcc -Wall */
-+	    ;
-     }
- }
- 
-@@ -210,7 +211,7 @@
- 		break;
- 	    case WALL_RANDOM:	/* both of this can't happen, */
- 	    case WALL_LAST:	/* so they are here to satisfy gcc -Wall */
--
-+	    	;
- 	}
-     }
-     return FLYING;
diff --git a/games-action/koth/koth-0.8.0-r1.ebuild b/games-action/koth/koth-0.8.0-r1.ebuild
index 988f9bf485dc..3030dcd88d94 100644
--- a/games-action/koth/koth-0.8.0-r1.ebuild
+++ b/games-action/koth/koth-0.8.0-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils flag-o-matic
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="Multiplayer, networked game of little tanks with really big weapons"
 HOMEPAGE="http://www.nongnu.org/koth/"
@@ -11,26 +12,25 @@ SRC_URI="https://savannah.nongnu.org/download/${PN}/default.pkg/${PV}/${P}.tar.b
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~x86"
-IUSE=""
 
 DEPEND="media-libs/libggi"
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/${PF}-gcc-3.4.patch
+	"${FILESDIR}"/${P}-autotools.patch
+	"${FILESDIR}"/${P}-gcc.patch
 )
 
 src_prepare() {
 	default
-	sed -i 's:-g -O2::' configure || die
-	sed -i 's:(uint16):(uint16_t):' src/gfx.c src/gfx.h || die
-	append-cflags -std=gnu89 # build with gcc5 (bug #570730)
+	mv configure.{in,ac} || die
+	eautoreconf
 }
 
 src_install() {
-	DOCS="AUTHORS ChangeLog NEWS README doc/*.txt" \
-		default
-	dodir /etc/koth
+	default
+	dodoc doc/*.txt
+
 	insinto /etc/koth
 	doins src/koth.cfg
 }
diff --git a/games-action/maelstrom/Manifest b/games-action/maelstrom/Manifest
index 102a38a24585..c7c99e1f3afd 100644
--- a/games-action/maelstrom/Manifest
+++ b/games-action/maelstrom/Manifest
@@ -1,8 +1,9 @@
 AUX maelstrom-3.0.6-64bits.patch 499 BLAKE2B fd74e9af6a9c5937ceef5c95ee865a133a5cd6eaa3864437fcd6f8b1db1bd8934861ec11c802dbb19875e81583b7f0e53db857071de209275c66793df1b00d22 SHA512 b75c094aa91ff443bed86b34ebb52a19221cdc69fd2745a714f1d7728dddd9886c8874054dff7a02513cff7a67cb6c115d7a2757401dd5bcaa96a52537f530a1
+AUX maelstrom-3.0.6-autotools.patch 787 BLAKE2B 069a5d2f656ee37040e9d2764043f89da23ef2c927f11c70ca1e726b96750b048bb5a94023045c82d53a71398719f75beb6520dbe89b16f2c62e679eb472ebed SHA512 75c1f8356e3ba50ea88051c1d4f33259c37cd512e83cffaf992e5a4875b53e02e6c044f0b803abd486df450186a0f94421b7f23749f2622ce634bf3850dfc2f0
 AUX maelstrom-3.0.6-gcc34.patch 878 BLAKE2B 6b260e8214f2a9b20f32ab3fde9950b2a115c9f6ca81bb1de7d7ea045c40a6c5b54694b034f554e6e060497b6d13495d822a410b7201244b5e1ce429cffbd885 SHA512 5427e198d6a595f9d68357d0ad31b8d1d7c6bc8db7dde261269a660d8e6102d83d592128e1e2f1c82285e764808f166798cb4a9121d88a8ec7c047efa6d856d6
 AUX maelstrom-3.0.6-gcc53.patch 537 BLAKE2B e5b0d5fe7cfdab51633988b93f592acc450b90e3732f035dc5b31a77b3319ab6f54d490eb992cb4d543e04489866ce2f068a24a4860980f4be474a5b04adc43b SHA512 cfd30e1474a084a1c45831b3d7c3f2a22ca6920e84838c4ff7615f179d377713d181f6d2bca3e660ee58ba2a62378838dec52cdb24fd896efecc40ff43a9c459
 AUX maelstrom-3.0.6-security.patch 14189 BLAKE2B 54af3ec92a0b8d3d7fdfa865114e65ab4ee3667cbdfedcd1d4cad6394273619a9d3cb7448dfa0e92f5a017d8778087e9be76e4615557cd59f20118b5c7c8f11b SHA512 7e8c6c5c7244fa8871fe55b95e9d2a8c631735590dba04e9e2dfed62e2dfc6264f1b990f3737d797c7762fbceda17474782b1720f944d444bdb8627b43188cb3
 AUX maelstrom-3.0.6-warnings.patch 438 BLAKE2B 8075ff8a90660e70837c48fa44d10cc0e284e3e51832d689dc87baa6b9aa19c9490c405bbd837aeb6d15988508402cb2a21a209723ff146f5bd5e9c0ca38fba2 SHA512 5310843f4a126acf62686aaa9d2086a85a313258fbc0b35b27a8bf7a24389a70264691454a018252d1997bc70093dbaf80c44282c3c59ba39d8cfaa7018866f7
 DIST Maelstrom-3.0.6.tar.gz 1007421 BLAKE2B 652aff33fa683307632ca1be35701c6cce62536845c459d9a06636871da504b2878ef0853d232ccbe854d8d541b97d91accdecc25f34ca17ef4bc9fcf516ea02 SHA512 fecd2411f5d2109aa99e5a6c65702c74f9f79326fc9f074a53005238c846780f231776b9c170ceb54b0470894b856abaa4708c59afd912fa5b2868e6776893ca
-EBUILD maelstrom-3.0.6-r3.ebuild 1919 BLAKE2B 36e8cedd88949036cc4ab643611a706f6fe990175cc3e0dedc31f32feb132526435d42f21cad9c7a8b9d9011e52eff8599cefef615594b19f3e9da6c67d59027 SHA512 6a5080ce35e0ce184269e4328649e898d054ff8350c9fb41345e07e057ebf9e509e702309c003c14b5ee9a852e92b1f3d3d3e0980b64d1e544bd8e8fa30bba10
+EBUILD maelstrom-3.0.6-r3.ebuild 1660 BLAKE2B 354c7aa7c3cbd6814ff0726242a68560ab589a6515a011cbb8fdbcb53b6b54f037f922364d6bf0acb679f93195e58e0ccf4029484693bd7adcf567ee9164a070 SHA512 47b71dfd92c99aed28de8cf6747129ffbe88a055e17343211b0537771dfae8e1da315696f44fb67dcd379b8510fe5081453f70f25038fc27c737ca559dcd7397
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-action/maelstrom/files/maelstrom-3.0.6-autotools.patch b/games-action/maelstrom/files/maelstrom-3.0.6-autotools.patch
new file mode 100644
index 000000000000..256578494857
--- /dev/null
+++ b/games-action/maelstrom/files/maelstrom-3.0.6-autotools.patch
@@ -0,0 +1,34 @@
+--- a/configure.in
++++ b/configure.in
+@@ -13,6 +13,7 @@
+ AC_PROG_MAKE_SET
+ AC_PROG_CC
+ AC_PROG_CXX
++AM_PROG_AR
+ AC_PROG_RANLIB
+ AC_PROG_INSTALL
+ 
+@@ -102,10 +103,10 @@
+         ;;
+     *-*-beos*)
+         ac_default_prefix=/boot/beos
+-        GAME_INSTALLDIR="\$(prefix)/games/$PACKAGE"
++        GAME_INSTALLDIR="\$(datadir)/$PACKAGE"
+         ;;
+     *)
+-        GAME_INSTALLDIR="\$(prefix)/games/$PACKAGE"
++        GAME_INSTALLDIR="\$(datadir)/$PACKAGE"
+         ;;
+ esac
+ AC_SUBST(GAME_INSTALLDIR)
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -65,7 +65,7 @@
+ 
+ # Special install rule for the game
+ install:
+-	make install_gamedata target=@GAME_INSTALLDIR@
++	$(MAKE) install-binPROGRAMS install_gamedata target=$(DESTDIR)/@GAME_INSTALLDIR@
+ 
+ install_gamedata:
+ 	sh mkinstalldirs $(target)/
diff --git a/games-action/maelstrom/maelstrom-3.0.6-r3.ebuild b/games-action/maelstrom/maelstrom-3.0.6-r3.ebuild
index db33e84ab966..50639f25c725 100644
--- a/games-action/maelstrom/maelstrom-3.0.6-r3.ebuild
+++ b/games-action/maelstrom/maelstrom-3.0.6-r3.ebuild
@@ -1,25 +1,25 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools eutils
+EAPI=7
+
+inherit autotools desktop
 
-MY_P=Maelstrom-${PV}
 DESCRIPTION="An asteroids battle game"
 HOMEPAGE="http://www.libsdl.org/projects/Maelstrom/"
-SRC_URI="http://www.libsdl.org/projects/Maelstrom/src/${MY_P}.tar.gz"
+SRC_URI="http://www.libsdl.org/projects/Maelstrom/src/${P^}.tar.gz"
 
-KEYWORDS="~alpha ~amd64 ~x86"
-SLOT="0"
 LICENSE="GPL-2"
-IUSE=""
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~x86"
 
-DEPEND="acct-group/gamestat
+DEPEND="
+	acct-group/gamestat
 	media-libs/libsdl[sound,joystick,video]
 	media-libs/sdl-net"
 RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${P^}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-security.patch
@@ -27,21 +27,17 @@ PATCHES=(
 	"${FILESDIR}"/${P}-gcc34.patch
 	"${FILESDIR}"/${P}-warnings.patch
 	"${FILESDIR}"/${P}-gcc53.patch
+	"${FILESDIR}"/${P}-autotools.patch
 )
 
 src_prepare() {
 	default
 
-	# Install the data into $(datadir)/..., not $(prefix)/games/...
-	sed -i \
-		-e "s:(prefix)/games/:(datadir)/:" configure.in || die
-	sed -i \
-		-e '/make install_gamedata/ { s:=:=$(DESTDIR)/:; s/make/$(MAKE)/; s/install_gamedata/install-binPROGRAMS install_gamedata/; }' Makefile.am || die
 	# Install the high scores file in ${GAMES_STATEDIR}
 	sed -i \
 		-e "s:path.Path(MAELSTROM_SCORES):\"/var/games/\"MAELSTROM_SCORES:" scores.cpp || die
-	mv configure.{in,ac}
-	rm aclocal.m4 acinclude.m4
+	mv configure.{in,ac} || die
+	rm aclocal.m4 acinclude.m4 || die
 	eautoreconf
 }
 
@@ -49,17 +45,17 @@ src_install() {
 	default
 	dodoc Changelog Docs/{Maelstrom-Announce,*FAQ,MaelstromGPL_press_release,*.Paper,Technical_Notes*}
 
-	newicon "${D}/usr/share/Maelstrom/icon.xpm" maelstrom.xpm
+	newicon "${ED}"/usr/share/Maelstrom/icon.xpm maelstrom.xpm
 	make_desktop_entry Maelstrom "Maelstrom" maelstrom
 
 	# Put the high scores file in the right place
 	insinto /var/games
-	doins "${D}/usr/share/Maelstrom/Maelstrom-Scores"
+	doins "${ED}"/usr/share/Maelstrom/Maelstrom-Scores
 
 	# clean up some cruft
-	rm -f \
-		"${D}/usr/share/Maelstrom/Maelstrom-Scores" \
-		"${D}/usr/share/Maelstrom/Images/Makefile*"
+	rm \
+		"${ED}"/usr/share/Maelstrom/Maelstrom-Scores \
+		"${ED}"/usr/share/Maelstrom/Images/Makefile* || die
 
 	# make sure we can update the high scores
 	fowners root:gamestat /var/games/Maelstrom-Scores /usr/bin/Maelstrom{,-netd}
diff --git a/games-action/minetest/Manifest b/games-action/minetest/Manifest
index 181e96a7f68a..89ec7ef5bdfe 100644
--- a/games-action/minetest/Manifest
+++ b/games-action/minetest/Manifest
@@ -1,6 +1,6 @@
 AUX minetestserver.confd 313 BLAKE2B 51af7c8d6c23461028774e459d3ff24a867102ac56c239da056e31ba800ec0904d4ad2daa26a9fd5069ecffc2fded37a8409d966403456c239e78d2a7c369345 SHA512 75442376afb031ad65880fd2b9cad034c520c7bed489543d5e1cee65fc998d0ae082d5736528dcdfaca41681b01ee895d7e0471f8581e8f0cba1a8cbbe20b3bc
 AUX minetestserver.initd 555 BLAKE2B 307f310338ded815dc8a6f8ba29d51ae77ef94a1530125ad82ab3b7dc6d9a1b8a40a48b6dfb53d17230418bc8e5e05ffe5493c897150a853338fb01c8ef21b5b SHA512 b9103841e18586e9877b1a1b7fc9510545d02b947d5558cfee79de09a8c770767aeeb1b29b35bd47bf3670d739996a782f347f2274a94f3b3a9435d37ba566f1
-AUX minetestserver.logrotate 74 BLAKE2B 1e842c4d523436b25741a839074777d6e74cc23580b23c5d06204c32e27114caa21898bea4b13473a6dc5e221c5976e3c5d492c8b5fe7a9698521417edd58304 SHA512 ba675801d6845532108a473cc9fe21982e47a77535c8a27c92ab24d854c0671f9ada1b1ed3224a4af16e2d84ed27b6b880557e6894b1892c7b4e5e07d3d9a185
-DIST minetest-5.2.0.tar.gz 10361815 BLAKE2B 244cacc92f08f571f45bedef9a8f2154a8105fc83c1396d626e78dcb0d4050c3ba9610ccf2ec2864a5d4b73d9d31aac0dc162fdcc277ef35cc1ead53158cc51f SHA512 47e3cdf488d50ea61659ac3b72960c9971270d1a793e0d79dcb649c89f7a6e65a16c21e1b903d08c916a2ebcbd3fd2164ec67173a3d4f2a2e9bb3a6351b48851
-EBUILD minetest-5.2.0.ebuild 3259 BLAKE2B 12c9c62b77158d90ed2ba059247f77dc68e4e2e682e304c48bd694ba6622776beee0129b3bf7c08e280c194bfd9b0743d11646c7b7855bb338c2067e1c089fcb SHA512 96731ed8ef82c5cb7c30b870537ec4bb0b4b03dd07c00cd39beb2071657f872270fda1c0d95c6047a5c02c7c363b7bfbb821ee8c01190a64fa60eff3a5937acd
+AUX minetestserver.logrotate 85 BLAKE2B 72ca62554a0146305cbafd9050378252bc4214c23a71d1f43041bd78ad332f25e834de3ae382f383ef8aef40fccb4849343fe23223ad2032efd16a12c10022f8 SHA512 19fe1e9264f195ea178cade577cea5cd93f7de1ceaab14ee00cafc051e1ec8f2e2ceac89557a00a3dd7838002e30da622f90a313776de2ad35aab10c68b6ec14
+DIST minetest-5.3.0.tar.gz 10828893 BLAKE2B 0847c040d2874962be79af6fce89b19354f6763cb37dd61d7e5e91bcacb9a76a115e295976056ae761db257612277ceef0d7e8bfc55790b1bc59a9c4961af41b SHA512 7bb34a80107861539a9ac2417812625ef11d145bf9401afdb8e0a1b9f619adcce24e2becf5bf361b805f4610097cf9d44c76d497ab08d489a43655852ce44777
+EBUILD minetest-5.3.0.ebuild 3324 BLAKE2B 2caa63762bd7a9af6547158da1f2aac1b9928219f902177918b23100aba684247fac35e24a19e2e3050a2ef9bfe9f041c13c656ce92c29e098641755aff09eea SHA512 2ec9925d508f64145ef47228a914f1caafb1a97c150d347e192d1ca6468b00020da3ff899ecae25b9809ffd591b74590630559c043133d3cd16989a43305f330
 MISC metadata.xml 2238 BLAKE2B 71d17709848d892d3eb5e99165bc21f41b3d3c4ff51f4b9923f078156eb48c743308cb74c5f84ecc147aa9284332e0968b6e47a34c0c412e32abde9685c1bb1f SHA512 33d80f695f354f623e7dd927881865e074c430b4b562f2ac2bcc716a6be0d9ef89bcd2eb773d9207d3887a00b8ff7b9017b8d613cd603499cb6b0226ed3ffce4
diff --git a/games-action/minetest/files/minetestserver.logrotate b/games-action/minetest/files/minetestserver.logrotate
index 879170349454..0ec4823663aa 100644
--- a/games-action/minetest/files/minetestserver.logrotate
+++ b/games-action/minetest/files/minetestserver.logrotate
@@ -1,5 +1,6 @@
 /var/log/minetest/minetest-server.log {
 	rotate 5
 	weekly
+	missingok
 	copytruncate
 }
diff --git a/games-action/minetest/minetest-5.2.0.ebuild b/games-action/minetest/minetest-5.3.0.ebuild
index 9f99e55d2d4d..94e307d76447 100644
--- a/games-action/minetest/minetest-5.2.0.ebuild
+++ b/games-action/minetest/minetest-5.3.0.ebuild
@@ -12,8 +12,9 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2.1+ CC-BY-SA-3.0 OFL-1.1 Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+client +curl doc +leveldb ncurses nls postgres redis +server +sound spatial +truetype"
+IUSE="+client +curl doc +leveldb ncurses nls postgres redis +server +sound spatial test +truetype"
 REQUIRED_USE="|| ( client server )"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-db/sqlite:3
@@ -72,6 +73,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DBUILD_CLIENT=$(usex client)
 		-DBUILD_SERVER=$(usex server)
+		-DBUILD_UNITTESTS=$(usex test)
 		-DCUSTOM_BINDIR="${EPREFIX}/usr/bin"
 		-DCUSTOM_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
 		-DCUSTOM_EXAMPLE_CONF_DIR="${EPREFIX}/usr/share/doc/${PF}"
diff --git a/games-action/teeworlds/Manifest b/games-action/teeworlds/Manifest
index 974067913c11..7602c87b0d84 100644
--- a/games-action/teeworlds/Manifest
+++ b/games-action/teeworlds/Manifest
@@ -1,16 +1,8 @@
-AUX 0.6/01-use-system-wavpack.patch 3182 BLAKE2B 814d3876e2657d636b2c9ae59fccfaab45e05918becde06aeba7154bb9a124d51cd6be20381355e73662d227e1d0985d35360ccf6308d1776ebcf3aca35025c0 SHA512 2210a018c3917b78109e31b3fa51a292c5c3714371880d2b9ce10de4cde999f014ff44555fa657fed78d961dbada2511601b3aa8e9356eb34de187f24b16dbad
-AUX 0.6/02-fixed-wavpack-sound-loading.patch 2916 BLAKE2B a2990c8feb143391c317d7b8ba3ef972bcbd8275f5ddec05a150fcefcdd4afd3fb0c3621bfac900b024fbbf85108f9ed7ee0b42ed38044b3e8f6b2142a3963f5 SHA512 9cada7356b588a220dba4a0c104a28738969c7755c80f9e9f10c4bf1f57ae1b6ea64c084aa012410de135fed0267e0e7ab8375137f2f16aba2d81c0441de2e8a
-AUX 0.6/03-use-system-pnglite.patch 5703 BLAKE2B 298668b9f592fbd9c5a6fbb0b1d12f5c13d3433dbb44018c987b1eb4f52b0bf2b4ad5cb0495f28870bf101ca9c5fc0464f85d53d62c2e80c03463ba8071173c2 SHA512 c069fc15de002b9e3f01bf9a36e40396aa62158bec1bb70a2dae6fbbace07299c298854319f80141d26e34b49dd270b9478383c55eb4b7e8873aedd323eb412b
-AUX 0.6/04-dedicated.patch 491 BLAKE2B 26504d5668b94b0e2010b02805f51f608414087e5df8a67d56ad5a5e41d47848fd1e6916137a2a6c12b328020c7592faa404d4c40f933622aef1dc0189faafae SHA512 c292b638e58e69fcf6b273617fc43cc4c8d96ffe4c75ad7911c1b319a129de6c01255f988569a0532b8e6c29f775ececc679274f7f85c6a9933bf713620ab8fb
-AUX 0.6/05-cc-cflags.patch 482 BLAKE2B 03059f30af2e1bc74c141ea0b8a1d0f53d324e29a3e0b1f89c96302abc63710ae35740c430ab234b6a8119d76ef71c753a703c9ee350fe788333294117472fd1 SHA512 92b74845413c20cf4626cb89b8b825bc5cb2f25e9af1d61d2ecabbda3acf024ee0c5e03abf8de2b57d6a8c739a8cf343fcb109a3a72d4baa016711e53368d0f8
 AUX teeworlds-init.d 1000 BLAKE2B 7681574d8e35583ea029b604925fa0ed3af50dafb17993e7315b2c9ff6bb83ecbe788e9745851d7763fd74018ef5ec222ba5b4a65c3b57ed0be2c7ae5b3e8b5a SHA512 01d39e8a0b5991000d336a4d51f8b61e296c0c9fce7b4247d24007b119c9c7a863e284e670b6286923a1e22fd25c4a171d20846feacea34bcc0c4d33120e98bd
-AUX teeworlds.xpm 2785 BLAKE2B 288e6fe273e38d802c102403f5e70d0a2c004bba28c3c1744f0a5f3d77168cc76dccf8039b9eca761d159cf7c1d127755171cc313ef3d614a195d9858426700a SHA512 f8a8a1c3a5675f12b13ddaf9b68bc2757698725d406356c871d58e62f735413b5f4f0bcb3dbf783e0aa6b3ecb0ec7f9eddbcef044506a6a07a374fe46d2616c0
 AUX teeworlds_srv.cfg 193 BLAKE2B dbbad582189f5b098e9f199dc59227ef90485e7a1bc406372d69f9985ee5a7fe39db68c52d8eb394a1c6e1320496925fa8c5474dd91204bf6e93787c2c0ba838 SHA512 d9a55f749f6974caddf96438eb38e490e0e507fbe07ebdac070fe91ab46eed93afb5dd6300a5b7a86b6282c6b97fdd178a00720483c3e71490be816b8c6a73b5
-DIST teeworlds-0.6.4-src.tar.gz 8771622 BLAKE2B 14493fcad458b0e1c749e40bdd6a5a858704bf971d53d11782d52fbe9b5fe2a09235dcac25340e51a3330001d46ee512f2971e8db06eb9f51eec5e6b3cd2a328 SHA512 7546ee358a2126339f6c727bb7b5f49009a8fad0b5e77a796202cba4d8fc5dfcaf79b7e65151d85fead2a70ad61ef3e1888b8c07fe0206f87575d5dd8c9f91ce
 DIST teeworlds-0.7.5-maps.tar.gz 151689 BLAKE2B f8ffbb6a024755bb972955a8c7d277709e17021c0554be0e2803e8c1b4848f5dca6d91b9f7f4e0731766745878c1143d27be3fa8aede01ff9cc69ac557ca70a8 SHA512 74084e169c1870cd541f5bb719c209210227055d304b3ce22fbad3d32d24b3356fbdec8d948edf3aa582270a8b0db7dec41e4924401f8398f7d5feba5ded49b3
 DIST teeworlds-0.7.5-translation.tar.gz 169121 BLAKE2B 1c649392385abf8e00d8c9e64ca7eaaa5af5848878566081cda83c7d78c417652137e7285d16038f302a6fdf94eb3993c506886d4cc1359694d534c7be5ea925 SHA512 41c69cd9e9290857b44be18f89ab9f3a7ccd6804757332966b973aec3a9e6fd5a40d323696a044a724228b2bb67b097311fa8c24fdec226eecb7a27c2da559dc
 DIST teeworlds-0.7.5.tar.gz 8654985 BLAKE2B ebeb9aa1119950e4d78d8c0d6c7be5711894c3212755a6db3b8b8c1f1803dba1e0d2e1a0e294e1a1fffe84a28beab8fac0e55fa0e94c68ed97e8764ac3b742d3 SHA512 673410a5fb5e488229ddc4ea4a1ac9cd8143a6e9499bde9f5535d7f0be5b6c85163065da9580c3de0d240f1cad63e0bc12c10caf1d893c324edb301bc150653b
 DIST teeworlds.png 21502 BLAKE2B 8064e0c2149f20f182b2ca2f7454f0e8395e199a432b8f21a9963cc771b1504ebe8cbe427ecd738d35313b1a378eaf8e305d509cd5360a07e9ab3c5224b78b77 SHA512 a272a1d9f13504c43ba873d93899df93c435f58cec20ae68bc9493a983e54cdd4c8f0f2e0630558c5e915aec891d2267bc3459ecc78c25738602452a2123fadf
-EBUILD teeworlds-0.6.4.ebuild 2391 BLAKE2B 83f8fe3b44e3bc40d93dadbe98aa38fb36e38963dd20394673d197f194ed23a8e6f7c7edc914c1f37ee48d339f7195530e608335aef639d850c64d61261c718a SHA512 214e0c0a4210ab302d48db14424d24c6444d3df6a1dda576ab084d8017a3898fcb6558da320717ca0a679e4e586638f83dfb3710da24dc30d5cfbe69b83cdbb3
 EBUILD teeworlds-0.7.5.ebuild 1947 BLAKE2B a1bbdbaa360202dcdf8092077e847cf591644b9893a913d462354cf95145e3a03394c60ecbf849ce9e805f3420c489a8a0c53e909d7ebc99b46e41935ee8da67 SHA512 1e4e539c77b549fc6183098aac12c4d30c89743ef2cd037204d047fa9ced2519893a2252cc2802fb99ed14ad7c854fc6a7f913b226c12afd659763d007bf9f98
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-action/teeworlds/files/0.6/01-use-system-wavpack.patch b/games-action/teeworlds/files/0.6/01-use-system-wavpack.patch
deleted file mode 100644
index 4a11a866511d..000000000000
--- a/games-action/teeworlds/files/0.6/01-use-system-wavpack.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-commit 7202b142891ee10771af9f1f3063664d75a38bbc
-Author: hasufell <hasufell@gentoo.org>
-Date:   Thu Sep 5 12:28:30 2013 +0200
-
-    Use system wavpack. Based on patch from Gentoo Bugzilla
-    
-    From: Azamat H. Hackimov <azamat.hackimov@gmail.com>
-    
-    https://bugs.gentoo.org/show_bug.cgi?id=363395
-
-diff --git a/bam.lua b/bam.lua
-index 11ac7b9..35c1d8d 100644
---- a/bam.lua
-+++ b/bam.lua
-@@ -11,6 +11,7 @@ config:Add(OptTestCompileC("stackprotector", "int main(){return 0;}", "-fstack-p
- config:Add(OptTestCompileC("minmacosxsdk", "int main(){return 0;}", "-mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk"))
- config:Add(OptTestCompileC("macosxppc", "int main(){return 0;}", "-arch ppc"))
- config:Add(OptLibrary("zlib", "zlib.h", false))
-+config:Add(OptLibrary("wavpack", "wavpack/wavpack.h", false))
- config:Add(SDL.OptFind("sdl", true))
- config:Add(FreeType.OptFind("freetype", true))
- config:Finalize("config.lua")
-@@ -187,7 +188,7 @@ function build(settings)
- 	end
- 
- 	-- compile zlib if needed
--	if config.zlib.value == 1 then
-+	if config.zlib.value == true then
- 		settings.link.libs:Add("z")
- 		if config.zlib.include_path then
- 			settings.cc.includes:Add(config.zlib.include_path)
-@@ -198,8 +199,18 @@ function build(settings)
- 		settings.cc.includes:Add("src/engine/external/zlib")
- 	end
- 
-+	if config.wavpack.value == true then
-+		settings.link.libs:Add("wavpack")
-+		if config.wavpack.include_path then
-+			settings.cc.includes:Add(config.wavpack.include_path)
-+		end
-+		wavpack = {}
-+	else
-+		wavpack = Compile(settings, Collect("src/engine/external/wavpack/*.c"))
-+		settings.cc.includes:Add("src/engine/external/") --The header is wavpack/wavpack.h so include the external folder
-+	end
-+
- 	-- build the small libraries
--	wavpack = Compile(settings, Collect("src/engine/external/wavpack/*.c"))
- 	pnglite = Compile(settings, Collect("src/engine/external/pnglite/*.c"))
- 
- 	-- build game components
-diff --git a/src/engine/client/sound.cpp b/src/engine/client/sound.cpp
-index 343fa2e..e32cac9 100644
---- a/src/engine/client/sound.cpp
-+++ b/src/engine/client/sound.cpp
-@@ -13,7 +13,7 @@
- #include "sound.h"
- 
- extern "C" { // wavpack
--	#include <engine/external/wavpack/wavpack.h>
-+	#include <wavpack/wavpack.h>
- }
- #include <math.h>
- 
-@@ -351,19 +351,25 @@ int CSound::LoadWV(const char *pFilename)
- 	if(!m_pStorage)
- 		return -1;
- 
-+	#ifndef WAVPACK_H
- 	ms_File = m_pStorage->OpenFile(pFilename, IOFLAG_READ, IStorage::TYPE_ALL);
- 	if(!ms_File)
- 	{
- 		dbg_msg("sound/wv", "failed to open file. filename='%s'", pFilename);
- 		return -1;
- 	}
-+	#endif
- 
- 	SampleID = AllocID();
- 	if(SampleID < 0)
- 		return -1;
- 	pSample = &m_aSamples[SampleID];
- 
-+	#ifndef WAVPACK_H
- 	pContext = WavpackOpenFileInput(ReadData, aError);
-+	#else
-+	pContext = WavpackOpenFileInput(pFilename, aError, 0, 0);
-+	#endif
- 	if (pContext)
- 	{
- 		int m_aSamples = WavpackGetNumSamples(pContext);
-@@ -419,8 +425,10 @@ int CSound::LoadWV(const char *pFilename)
- 		dbg_msg("sound/wv", "failed to open %s: %s", pFilename, aError);
- 	}
- 
-+	#ifndef WAVPACK_H
- 	io_close(ms_File);
- 	ms_File = NULL;
-+	#endif
- 
- 	if(g_Config.m_Debug)
- 		dbg_msg("sound/wv", "loaded %s", pFilename);
diff --git a/games-action/teeworlds/files/0.6/02-fixed-wavpack-sound-loading.patch b/games-action/teeworlds/files/0.6/02-fixed-wavpack-sound-loading.patch
deleted file mode 100644
index e207a4a354bf..000000000000
--- a/games-action/teeworlds/files/0.6/02-fixed-wavpack-sound-loading.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-commit b96981f5f23b4269108afb465f29a23abbd32ae2
-Author: hasufell <hasufell@gentoo.org>
-Date:   Thu Sep 5 12:31:19 2013 +0200
-
-    Fixing wavpack sound loading. Based on Gentoo Bugzilla
-    
-    From: Azamat H. Hackimov <azamat.hackimov@gmail.com>
-    
-    https://bugs.gentoo.org/show_bug.cgi?id=363395
-
-diff --git a/src/engine/client/sound.cpp b/src/engine/client/sound.cpp
-index e32cac9..2a4c653 100644
---- a/src/engine/client/sound.cpp
-+++ b/src/engine/client/sound.cpp
-@@ -51,6 +51,55 @@ struct CVoice
- 	int m_X, m_Y;
- } ;
- 
-+#ifdef WAVPACK_H
-+static int32_t ReadBytes(void *pFile, void *pBuffer, int32_t Size)
-+{
-+	return (int32_t)io_read((IOHANDLE)pFile, pBuffer, Size);
-+}
-+static uint32_t GetPos(void *pFile)
-+{
-+	return (uint32_t)io_tell((IOHANDLE)pFile);
-+}
-+static int SetPosAbs(void *pFile, uint32_t Offset)
-+{
-+	return io_seek((IOHANDLE)pFile, Offset, IOSEEK_START);
-+}
-+static int SetPosRel(void *pFile, int32_t Offset, int Mode)
-+{
-+	switch(Mode)
-+	{
-+	case SEEK_SET:
-+		Mode = IOSEEK_START;
-+		break;
-+	case SEEK_CUR:
-+		Mode = IOSEEK_CUR;
-+		break;
-+	case SEEK_END:
-+		Mode = IOSEEK_END;
-+	}
-+	return io_seek((IOHANDLE)pFile, Offset, Mode);
-+}
-+
-+//TODO: Fix if 'real' functionality is needed by the wavpack header
-+static int PushBackByte(void *pFile, int Char)
-+{
-+	return io_seek((IOHANDLE)pFile, -1, IOSEEK_CUR);
-+}
-+static uint32_t GetLength(void *pFile)
-+{
-+	return (uint32_t)io_length((IOHANDLE)pFile);
-+}
-+// Essentially assuming this to always be true, should fix if this isn't the case
-+static int CanSeek(void *pFile)
-+{
-+	return pFile != NULL;
-+}
-+static WavpackStreamReader CWavpackReader  = {
-+    ReadBytes, GetPos, SetPosAbs, SetPosRel, PushBackByte, GetLength, CanSeek, 0
-+};
-+#endif
-+
-+
- static CSample m_aSamples[NUM_SAMPLES] = { {0} };
- static CVoice m_aVoices[NUM_VOICES] = { {0} };
- static CChannel m_aChannels[NUM_CHANNELS] = { {255, 0} };
-@@ -351,14 +400,12 @@ int CSound::LoadWV(const char *pFilename)
- 	if(!m_pStorage)
- 		return -1;
- 
--	#ifndef WAVPACK_H
- 	ms_File = m_pStorage->OpenFile(pFilename, IOFLAG_READ, IStorage::TYPE_ALL);
- 	if(!ms_File)
- 	{
- 		dbg_msg("sound/wv", "failed to open file. filename='%s'", pFilename);
- 		return -1;
- 	}
--	#endif
- 
- 	SampleID = AllocID();
- 	if(SampleID < 0)
-@@ -368,7 +415,7 @@ int CSound::LoadWV(const char *pFilename)
- 	#ifndef WAVPACK_H
- 	pContext = WavpackOpenFileInput(ReadData, aError);
- 	#else
--	pContext = WavpackOpenFileInput(pFilename, aError, 0, 0);
-+	pContext = WavpackOpenFileInputEx(&CWavpackReader, ms_File, 0, aError, 0, 0);
- 	#endif
- 	if (pContext)
- 	{
-@@ -422,13 +469,11 @@ int CSound::LoadWV(const char *pFilename)
- 	}
- 	else
- 	{
--		dbg_msg("sound/wv", "failed to open %s: %s", pFilename, aError);
-+		dbg_msg("sound/wv", "failed to open '%s': %s", pFilename, aError);
- 	}
- 
--	#ifndef WAVPACK_H
- 	io_close(ms_File);
- 	ms_File = NULL;
--	#endif
- 
- 	if(g_Config.m_Debug)
- 		dbg_msg("sound/wv", "loaded %s", pFilename);
diff --git a/games-action/teeworlds/files/0.6/03-use-system-pnglite.patch b/games-action/teeworlds/files/0.6/03-use-system-pnglite.patch
deleted file mode 100644
index 81c3d915316b..000000000000
--- a/games-action/teeworlds/files/0.6/03-use-system-pnglite.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-commit 291a375000ac8d9cd5548a863ea6b49c46cfb1bb
-Author: hasufell <hasufell@gentoo.org>
-Date:   Thu Sep 5 12:36:53 2013 +0200
-
-    Use system pnglite. Based on Gentoo Bugzilla
-    
-    From: Azamat H. Hackimov <azamat.hackimov@gmail.com>
-    
-    https://bugs.gentoo.org/show_bug.cgi?id=363395
-
-diff --git a/bam.lua b/bam.lua
-index 35c1d8d..7902a2c 100644
---- a/bam.lua
-+++ b/bam.lua
-@@ -11,6 +11,7 @@ config:Add(OptTestCompileC("stackprotector", "int main(){return 0;}", "-fstack-p
- config:Add(OptTestCompileC("minmacosxsdk", "int main(){return 0;}", "-mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk"))
- config:Add(OptTestCompileC("macosxppc", "int main(){return 0;}", "-arch ppc"))
- config:Add(OptLibrary("zlib", "zlib.h", false))
-+config:Add(OptLibrary("pnglite", "pnglite.h", false))
- config:Add(OptLibrary("wavpack", "wavpack/wavpack.h", false))
- config:Add(SDL.OptFind("sdl", true))
- config:Add(FreeType.OptFind("freetype", true))
-@@ -199,26 +200,34 @@ function build(settings)
- 		settings.cc.includes:Add("src/engine/external/zlib")
- 	end
- 
-+	-- build game components
-+	engine_settings = settings:Copy()
-+	server_settings = engine_settings:Copy()
-+	client_settings = engine_settings:Copy()
-+	launcher_settings = engine_settings:Copy()
-+
-+	if config.pnglite.value == true then
-+		client_settings.link.libs:Add("pnglite")
-+		if config.pnglite.include_path then
-+			client_settings.cc.includes:Add(config.pnglite.include_path)
-+		end
-+		pnglite = {}
-+	else
-+		pnglite = Compile(settings, Collect("src/engine/external/pnglite/*.c"))
-+		client_settings.cc.includes:Add("src/engine/external/pnglite")
-+	end
-+
- 	if config.wavpack.value == true then
--		settings.link.libs:Add("wavpack")
-+		client_settings.link.libs:Add("wavpack")
- 		if config.wavpack.include_path then
--			settings.cc.includes:Add(config.wavpack.include_path)
-+			client_settings.cc.includes:Add(config.wavpack.include_path)
- 		end
- 		wavpack = {}
- 	else
- 		wavpack = Compile(settings, Collect("src/engine/external/wavpack/*.c"))
--		settings.cc.includes:Add("src/engine/external/") --The header is wavpack/wavpack.h so include the external folder
-+		client_settings.cc.includes:Add("src/engine/external/") --The header is wavpack/wavpack.h so include the external folder
- 	end
- 
--	-- build the small libraries
--	pnglite = Compile(settings, Collect("src/engine/external/pnglite/*.c"))
--
--	-- build game components
--	engine_settings = settings:Copy()
--	server_settings = engine_settings:Copy()
--	client_settings = engine_settings:Copy()
--	launcher_settings = engine_settings:Copy()
--
- 	if family == "unix" then
- 		if platform == "macosx" then
- 			client_settings.link.frameworks:Add("OpenGL")
-diff --git a/src/engine/client/graphics.cpp b/src/engine/client/graphics.cpp
-index 2e8a855..97e4fd7 100644
---- a/src/engine/client/graphics.cpp
-+++ b/src/engine/client/graphics.cpp
-@@ -9,7 +9,7 @@
- #include "SDL_opengl.h"
- 
- #include <base/system.h>
--#include <engine/external/pnglite/pnglite.h>
-+#include <pnglite.h>
- 
- #include <engine/shared/config.h>
- #include <engine/graphics.h>
-diff --git a/src/engine/client/graphics_threaded.cpp b/src/engine/client/graphics_threaded.cpp
-index e34b725..60246d1 100644
---- a/src/engine/client/graphics_threaded.cpp
-+++ b/src/engine/client/graphics_threaded.cpp
-@@ -6,7 +6,7 @@
- #include <base/tl/threading.h>
- 
- #include <base/system.h>
--#include <engine/external/pnglite/pnglite.h>
-+#include <pnglite.h>
- 
- #include <engine/shared/config.h>
- #include <engine/graphics.h>
-diff --git a/src/tools/dilate.cpp b/src/tools/dilate.cpp
-index 55094a5..42a5b83 100644
---- a/src/tools/dilate.cpp
-+++ b/src/tools/dilate.cpp
-@@ -2,7 +2,7 @@
- /* If you are missing that file, acquire a complete release at teeworlds.com.                */
- #include <base/system.h>
- #include <base/math.h>
--#include <engine/external/pnglite/pnglite.h>
-+#include <pnglite.h>
- 
- typedef struct
- {
-diff --git a/src/tools/tileset_borderadd.cpp b/src/tools/tileset_borderadd.cpp
-index 25e2fa5..88f760a 100644
---- a/src/tools/tileset_borderadd.cpp
-+++ b/src/tools/tileset_borderadd.cpp
-@@ -2,7 +2,7 @@
- /* If you are missing that file, acquire a complete release at teeworlds.com.                */
- #include <base/math.h>
- #include <base/system.h>
--#include <engine/external/pnglite/pnglite.h>
-+#include <pnglite.h>
- 
- typedef struct
- {
-diff --git a/src/tools/tileset_borderfix.cpp b/src/tools/tileset_borderfix.cpp
-index 0facb9a..ab36292 100644
---- a/src/tools/tileset_borderfix.cpp
-+++ b/src/tools/tileset_borderfix.cpp
-@@ -1,7 +1,7 @@
- /* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
- /* If you are missing that file, acquire a complete release at teeworlds.com.                */
- #include <base/system.h>
--#include <engine/external/pnglite/pnglite.h>
-+#include <pnglite.h>
- 
- typedef struct
- {
-diff --git a/src/tools/tileset_borderrem.cpp b/src/tools/tileset_borderrem.cpp
-index d604ecb..8673e41 100644
---- a/src/tools/tileset_borderrem.cpp
-+++ b/src/tools/tileset_borderrem.cpp
-@@ -2,7 +2,7 @@
- /* If you are missing that file, acquire a complete release at teeworlds.com.                */
- #include <base/math.h>
- #include <base/system.h>
--#include <engine/external/pnglite/pnglite.h>
-+#include <pnglite.h>
- 
- typedef struct
- {
-diff --git a/src/tools/tileset_borderset.cpp b/src/tools/tileset_borderset.cpp
-index 8b3e299..c762ee2 100644
---- a/src/tools/tileset_borderset.cpp
-+++ b/src/tools/tileset_borderset.cpp
-@@ -2,7 +2,7 @@
- /* If you are missing that file, acquire a complete release at teeworlds.com.                */
- #include <base/math.h>
- #include <base/system.h>
--#include <engine/external/pnglite/pnglite.h>
-+#include <pnglite.h>
- 
- typedef struct
- {
diff --git a/games-action/teeworlds/files/0.6/04-dedicated.patch b/games-action/teeworlds/files/0.6/04-dedicated.patch
deleted file mode 100644
index fc61b71283b6..000000000000
--- a/games-action/teeworlds/files/0.6/04-dedicated.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sun Sep  8 11:05:26 UTC 2013
-Subject: fix DATADIR detection for minimal setups
-
---- a/src/engine/shared/storage.cpp
-+++ b/src/engine/shared/storage.cpp
-@@ -208,7 +208,7 @@
- 			for (i = 0; i < DirsCount; i++)
- 			{
- 				char aBuf[128];
--				str_format(aBuf, sizeof(aBuf), "%s/mapres", aDirs[i]);
-+				str_format(aBuf, sizeof(aBuf), "%s/maps", aDirs[i]);
- 				if(fs_is_dir(aBuf))
- 				{
- 					str_copy(m_aDatadir, aDirs[i], sizeof(m_aDatadir));
diff --git a/games-action/teeworlds/files/0.6/05-cc-cflags.patch b/games-action/teeworlds/files/0.6/05-cc-cflags.patch
deleted file mode 100644
index dec6b8d306fc..000000000000
--- a/games-action/teeworlds/files/0.6/05-cc-cflags.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sun Sep  8 12:25:19 UTC 2013
-Subject: respect our gentoo settings
-
-	this has to be at this place or later
-	otherwise some of our settings would be overwritten
-
---- a/bam.lua
-+++ b/bam.lua
-@@ -168,6 +168,8 @@
- 	-- set some platform specific settings
- 	settings.cc.includes:Add("src")
- 
-+	dofile("gentoo.lua") addSettings(settings)
-+
- 	if family == "unix" then
- 		if platform == "macosx" then
- 			settings.link.frameworks:Add("Carbon")
diff --git a/games-action/teeworlds/files/teeworlds.xpm b/games-action/teeworlds/files/teeworlds.xpm
deleted file mode 100644
index 76e30166dd35..000000000000
--- a/games-action/teeworlds/files/teeworlds.xpm
+++ /dev/null
@@ -1,66 +0,0 @@
-/* XPM */
-static char *teeworlds__[] = {
-/* columns rows colors chars-per-pixel */
-"48 48 12 1",
-"  c #000000",
-". c #800000",
-"X c #FF0000",
-"o c #008000",
-"O c #808000",
-"+ c #FFFF00",
-"@ c #000080",
-"# c #800080",
-"$ c #008080",
-"% c #808080",
-"& c #C0C0C0",
-"* c None",
-/* pixels */
-"*********************%%.%%%*********************",
-"*****************%            %*****************",
-"***************     .%O%OOO.     ***************",
-"*************   ..%+&++++++++&O   @*************",
-"***********%   O&&++++++++++++++%   ************",
-"**********O  .+&&+++++++++++++++++O  %**********",
-"*********@  O&&&+++++++++++++++++++%  %*********",
-"********  .O&+++++++++++++++++++++++%  %********",
-"*******%  O+&++++++++++++++++++++++++%  ********",
-"*******  O+&&+++++++++++++++++++++++++%  *******",
-"******  O+X&+++++++++++++++++++++++++++O .******",
-"*****% .OX++++++++++++++++++++++++++++++  ******",
-"*****  .++++++++++++   +++++O@ ++++++++++  *****",
-"****%  ++X+++++++++     +++O  . +++++++++  *****",
-"****  O+X++++++++++     +++     +++++++++O %****",
-"****  X++X+++++++++     +++     ++++++++++  ****",
-"****  ++X+&++++++++     +++     ++++++++++  ****",
-"***% .+X+O+++++++++     +++     ++++++++++O ****",
-"***% O++X+&++++++++     +++     ++++++++++% %***",
-"***  O+X+++++++++++     +++O    ++++++++++O %***",
-"***  OX+X+X+++++++++   +++++   +++++++++++& .***",
-"***  ++++X+&++++++++++++++++++++++++++++++O $***",
-"***  OX+X++%++++++++++++++++++++++++++++++% .***",
-"***  O+O++X+++++++++++++++++++++++++++++++% %***",
-"***  O+X+X+++++++++++++++++++++++++++++++&O %***",
-"***% .+O++X+X+++++++++++++++++++++++++++++  ****",
-"****  +X+X+++%+++++++++++++++++++++++++++&  ****",
-"****  O++O+OX+&++++++++++++++++++++++++++%  ****",
-"****% .+X+X++++&+++++++++++++++++++++++++. %****",
-"*****  O+O+X+OX+&+++++++++++++++++++++++%  *****",
-"*****  O+X++X+++++++++++++++++++++++++++@ %*****",
-"******  OO+X++X+X++++++++++++++++++++++%  ******",
-"******%  ++O+X++O+++++++++++++++++++++&  %******",
-"*******  .O o   .O.O+&+++++++++++++++&. %*******",
-"******%    O.OOO#o.  OO+&+++++++++++&.  ********",
-"*****%  .O+X&X+X+X%+.  OX++&+&+&X+X+     *******",
-"*****  .%OX+O+%O+&+X&+O oO+X+X++++O .OO   ******",
-"****% .OO+%+&X+&+X+%+X&X .+O++X+O. #%+X+.  *****",
-"****  O+X+X+X+%+X&++%+O+% O+X+OO .O+X+&OO. *****",
-"****  OX+%+O%+%+%+&X+&X+XO OO  .O%+%+%X+%O $****",
-"****  +OOX+X+X+X+X+%+X+%+.  ..O%X+X+X+%+X% .****",
-"****  OX+%+%+%+%+%+%+%+X+. O+%+O+%+%+%+X+O  ****",
-"****  OOX+X+X+X+OX+X+X+OO.OX+X+XOX+X+X+OO  %****",
-"****%  OOOOOOO+XO+OOOOO.  OOOOOO+OOOOOO.   %****",
-"*****                                     %*****",
-"*******                                .%*******",
-"***********%%%%%%%%%%%**%%%%%%%%%%%%************",
-"************************************************"
-};
diff --git a/games-action/teeworlds/teeworlds-0.6.4.ebuild b/games-action/teeworlds/teeworlds-0.6.4.ebuild
deleted file mode 100644
index e0a278459205..000000000000
--- a/games-action/teeworlds/teeworlds-0.6.4.ebuild
+++ /dev/null
@@ -1,118 +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 eutils multiprocessing python-any-r1 toolchain-funcs versionator
-
-REVISION="b177-rff25472"
-
-DESCRIPTION="Online multi-player platform 2D shooter"
-HOMEPAGE="https://www.teeworlds.com/"
-SRC_URI="https://downloads.teeworlds.com/${P}-src.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug dedicated"
-
-RDEPEND="
-	!dedicated? (
-		app-arch/bzip2
-		media-libs/freetype
-		media-libs/libsdl[X,sound,opengl,video]
-		media-libs/pnglite
-		media-sound/wavpack
-		virtual/glu
-		virtual/opengl
-		x11-libs/libX11 )
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	~dev-util/bam-0.4.0"
-
-S=${WORKDIR}/${P}-src
-MY_PV=$(get_version_component_range 1-2)
-
-PATCHES=(
-	"${FILESDIR}/${MY_PV}/01-use-system-wavpack.patch"
-	"${FILESDIR}/${MY_PV}/02-fixed-wavpack-sound-loading.patch"
-	"${FILESDIR}/${MY_PV}/03-use-system-pnglite.patch"
-	"${FILESDIR}/${MY_PV}/04-dedicated.patch"
-	"${FILESDIR}/${MY_PV}/05-cc-cflags.patch"
-)
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	rm -r src/engine/external/* || die
-
-	cat <<- __EOF__ > "${S}/gentoo.lua"
-		function addSettings(settings)
-			print("Adding Gentoo settings")
-			settings.optimize = 0
-			settings.cc.exe_c = "$(tc-getCC)"
-			settings.cc.exe_cxx = "$(tc-getCXX)"
-			settings.cc.flags_c:Add("${CFLAGS}")
-			settings.cc.flags_cxx:Add("${CXXFLAGS}")
-			settings.link.exe = "$(tc-getCXX)"
-			settings.link.flags:Add("${LDFLAGS}")
-		end
-	__EOF__
-}
-
-src_configure() {
-	bam -v config || die
-}
-
-src_compile() {
-	local myopt
-
-	if use debug; then
-		myopt=" server_debug"
-	else
-		myopt=" server_release"
-	fi
-	if ! use dedicated; then
-		if use debug; then
-			myopt+=" client_debug"
-		else
-			myopt+=" client_release"
-		fi
-	fi
-
-	bam -v -a -j $(makeopts_jobs) ${myopt} || die
-}
-
-src_install() {
-	if use debug; then
-		newbin ${PN}_srv_d ${PN}_srv
-	else
-		dobin ${PN}_srv
-	fi
-	if ! use dedicated; then
-		if use debug; then
-			newbin ${PN}_d ${PN}
-		else
-			dobin ${PN}
-		fi
-
-		doicon "${FILESDIR}"/${PN}.xpm
-		make_desktop_entry ${PN} Teeworlds
-
-		insinto /usr/share/${PN}/data
-		doins -r data/*
-	else
-		insinto /usr/share/${PN}/data/maps
-		doins -r data/maps/*
-	fi
-	newinitd "${FILESDIR}"/${PN}-init.d ${PN}
-	insinto "/etc/${PN}"
-	doins "${FILESDIR}"/teeworlds_srv.cfg
-
-	dodoc readme.txt
-}