gentoo resync : 20.11.2017

24 files changed, 174 insertions, 358 deletions

diff --git a/games-action/0verkill/0verkill-0.16-r3.ebuild b/games-action/0verkill/0verkill-0.16-r3.ebuild
deleted file mode 100644
index 3c347dd0a14d..000000000000
--- a/games-action/0verkill/0verkill-0.16-r3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils games
-
-DESCRIPTION="a bloody 2D action deathmatch-like game in ASCII-ART"
-HOMEPAGE="http://artax.karlin.mff.cuni.cz/~brain/0verkill/"
-SRC_URI="http://artax.karlin.mff.cuni.cz/~brain/0verkill/release/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-DEPEND="X? ( x11-libs/libXpm )"
-RDEPEND=${DEPEND}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-docs.patch \
-		"${FILESDIR}"/${P}-home-overflow.patch \
-		"${FILESDIR}"/${P}-segv.patch \
-		"${FILESDIR}"/${P}-gentoo-paths.patch \
-		"${FILESDIR}"/${P}-ovflfix.patch \
-		"${FILESDIR}"/${P}-CC.patch \
-		"${FILESDIR}"/${P}-underflow-check.patch #136222 \
-	sed -i \
-		-e "s:data/:${GAMES_DATADIR}/${PN}/data/:" cfg.h || die
-	sed -i \
-		-e "s:@CFLAGS@ -O3 :@CFLAGS@ :" Makefile.in || die
-	sed -i \
-		-e "/gettimeofday/s/getopt/getopt calloc/" configure.in || die
-	eautoreconf
-}
-
-src_configure() {
-	egamesconf $(use_with X x)
-}
-
-src_install() {
-	local x
-	dogamesbin 0verkill
-	for x in avi bot editor server test_server ; do
-		newgamesbin ${x} 0verkill-${x}
-	done
-	if use X ; then
-		dogamesbin x0verkill
-		for x in avi editor ; do
-			newgamesbin ${x} 0verkill-${x}
-		done
-	fi
-
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r data grx
-
-	dohtml doc/*.html
-	rm doc/*.html doc/README.OS2 doc/Readme\ Win32.txt doc/COPYING
-	dodoc doc/*
-
-	prepgamesdirs
-}
diff --git a/games-action/0verkill/0verkill-0.16-r4.ebuild b/games-action/0verkill/0verkill-0.16-r4.ebuild
index b512d03cdb80..478fcc1bbda7 100644
--- a/games-action/0verkill/0verkill-0.16-r4.ebuild
+++ b/games-action/0verkill/0verkill-0.16-r4.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools eutils
 
-DESCRIPTION="a bloody 2D action deathmatch-like game in ASCII-ART"
-HOMEPAGE="http://artax.karlin.mff.cuni.cz/~brain/0verkill/"
+inherit autotools
+
+DESCRIPTION="A bloody 2D action deathmatch-like game in ASCII-ART"
+HOMEPAGE="http://freecode.com/projects/0verkill"
 SRC_URI="http://artax.karlin.mff.cuni.cz/~brain/0verkill/release/${P}.tgz"
 
 LICENSE="GPL-2"
@@ -34,6 +35,8 @@ src_prepare() {
 		-e "s:@CFLAGS@ -O3 :@CFLAGS@ :" Makefile.in || die
 	sed -i \
 		-e "/gettimeofday/s/getopt/getopt calloc/" configure.in || die
+
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
@@ -42,8 +45,8 @@ src_configure() {
 }
 
 src_install() {
-	local x
 	dobin 0verkill
+	local x
 	for x in avi bot editor server test_server ; do
 		newbin ${x} 0verkill-${x}
 	done
@@ -54,9 +57,9 @@ src_install() {
 		done
 	fi
 
-	insinto "/usr/share/${PN}"
+	insinto /usr/share/${PN}
 	doins -r data grx
 
-	rm doc/README.OS2 doc/Readme\ Win32.txt doc/COPYING
-	dodoc -r doc/
+	rm doc/{README.OS2,"Readme Win32.txt",COPYING} || die
+	dodoc -r doc/.
 }
diff --git a/games-action/0verkill/Manifest b/games-action/0verkill/Manifest
index 0789f6bf5e72..81ee388ed2d8 100644
--- a/games-action/0verkill/Manifest
+++ b/games-action/0verkill/Manifest
@@ -6,8 +6,7 @@ AUX 0verkill-0.16-ovflfix.patch 805 SHA256 437c92bdd39d44842fad0ee8386e4dae2093c
 AUX 0verkill-0.16-segv.patch 1560 SHA256 b49cb1a14667cc4033e6094f99a9ddc1ef242381acac83a3abdeebf208724291 SHA512 05ce966d80cf199a9602cb7143a2d7e8479ccb4b03da2275dc8a93a9065d387fe15426c48559279acb73eb3c371306a02706de899d5c6a97c123319426b3f6bc WHIRLPOOL 9578ee8bd00cdb6860a348a6aa37c1ac3efc9ccead20152d3317377e2afec99798b523d8e0d458699d6ecd10d86e35b25416c8e11b5bc555d1b72b34b0502e8a
 AUX 0verkill-0.16-underflow-check.patch 675 SHA256 e918e3b2b632632cca8c337caf019b0c2565ded120b8055a4d31677d446ef8e5 SHA512 3b5bff2c18c1862fadbb3d932be23f35559ed9eb3ffb979cf11c50bbac9fff8928b5ead8349ddfc78c84d07a5d1afe4431af56263568b3b82fd7cb015f442e42 WHIRLPOOL 1ba725a9232cd2374d4273a770c1223ebae68d81486e4443c5d9a6ebd7fe12d8a20815b07d2afe6e8d40948aa81c9e19ec440bbd313b9876b7baec73453caf42
 DIST 0verkill-0.16.tgz 276579 SHA256 8091261c3fef3535edb97ab46cb48c067befb329e951bfa3f1b54ae6b7e1dadf SHA512 6ab273085f2be3a6d0a2b785a51a9bfd52add0212b3c8522b22255c4e3e48a9470f20d9d678158233da9c9465563279079c29ca5526d322247f2ef1d74107144 WHIRLPOOL 7a1dff93014ea67f6d16efea408ed77219a391b015a0d533a53d52eb735d8b84c8cc0f4e1cb6997aca2b3d238b57f7cff780f11fe838ded362769529cf437665
-EBUILD 0verkill-0.16-r3.ebuild 1446 SHA256 458f863b23773203c010f3f44cb7cc32b5746f44b123badf04ac94a04392bf09 SHA512 a2715e30dc6be6be08cb8fa5b96c4944e2a7ffa4f3f9e63022ccdd5a6ea65884398840df8178190a351752ba235413295013ce9b3443a3789125d53ce8d47a62 WHIRLPOOL 91dbba4069faf765d5e405202da7329c47feb847f94e88a044229ff8b1d74849860e295db78aa3fc57db642149f2ca412b277773b3c496582bbef3cd72759f0f
-EBUILD 0verkill-0.16-r4.ebuild 1357 SHA256 7c3d1955848c9bea9b1f6ba10245c3d63575431c2244e1f1b6f2ec24b77d8932 SHA512 886bbb6cf2c2ee91e04ca4c2305a81980fe135b0c2945ebb6911e0abe6d7c304a6e8df8f311d79e11c5637af8c8b4595dbd22db4622aad28bee94c9edf0b1e06 WHIRLPOOL 2979c1ae3ccb644acfae1c9fdaffb880519cd6ceb0696d6597be70a6e3b0231d8c193bc5ea921a5744c0ddf246cd091c7db4e4bdf8b6639fb5567a4a5db8ec4e
+EBUILD 0verkill-0.16-r4.ebuild 1371 SHA256 4ac203872fb9c8240cb28c23e2172f126909e5b5f2e6765c718f595ac390064d SHA512 35c019c33ffbc2b9429770b697b58b15368fbc251a13e16a345409224e9fd1a1dac8a6c1b9ac5cee609cbb8d2ef1a7342596f2bc9c8b9ad5ee900a6634008795 WHIRLPOOL bd8145879af86cf657996d9864fe765fad2c536aa8da089950fb8c876cb20bd40165c2f2b412d28e63407875be0864e8a2c3f452db34034b2fbc13619f6b388d
 MISC ChangeLog 3253 SHA256 a43fba250411ce853c279fc0accdc0cea8b5328f8a42ee28d2cb34f909380bf7 SHA512 2cac7a43f6a2a7ddcc67618750b53b3c73b83112a042589d1d198b9954bd2211bcfa28da3d7ff9c545beed3dea1bcf59527928851aefdc3ecf2813de895ba2dd WHIRLPOOL f3bbf18bd555a429721a3131b582864f3fc4b81f5a73c09f24214a79c8c9aaf6d8253c0427b4a502d6e322140163c2ff4909ba56881ddf73893a6aba08f6e8b8
 MISC ChangeLog-2015 2606 SHA256 1974704c5722bdd51f6d91e620c791f110bb94838d35ceeb943873d0a3260d1e SHA512 51aa9146da9c9b4f1a2eb5167fe7000093a7db8e2e8cc12cff0a736e70e869671408d1b4fd9ae577ad1e3d654a82de0a96fff31337dc86f08e6b82c5c8f15829 WHIRLPOOL 9ecb5ee655fe2e6a96c7d123bb0f3252a330a7ee2bb4de63769f62797c795b8c6fb214d0544021b9dc3c3e3532fdc73e88f71842d82324039cc1a67e14ae5b47
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-action/abuse/Manifest b/games-action/abuse/Manifest
index 28346f79e738..4ef46dad057a 100644
--- a/games-action/abuse/Manifest
+++ b/games-action/abuse/Manifest
@@ -1,7 +1,6 @@
 AUX abuse-0.8-gentoo.patch 891 SHA256 6a41148d6337bc19454243c126cb2169702817cc6480ddec421ef9d78efcaf49 SHA512 544858fd991c611eeac9470c833b15be8c06c709f2b6dc473ab35ec7e5e4aae885a363d17f09080afcd4022229089cf46fe5b7c0abd14fb7b84449bb46ac35d9 WHIRLPOOL 7df3b9cf88eb25f7a774a55a5e9361770401b4e9ef7a1b81bad72aa4d7bb872edd9b223a50f85952c0cfceccfc59a9d65e2c98366e06a36ae1c9cf80d9178d95
 DIST abuse-0.8.tar.gz 6053500 SHA256 0104db5fd2695c9518583783f7aaa7e5c0355e27c5a803840a05aef97f9d3488 SHA512 5c60dcf6910f9f751da26e919cd289c12349bb82eb925f9a41dc921263ece0d0f5f24c2ab2d1c718c0a5d0315453f92dfcba665fe5082eb4135ed737d2859d18 WHIRLPOOL f33cc8f2238e59e4aa6b8387987859baada02f292cbfc45c451eb1d0db41c36f2548cb2d9e527c5437957aacd3062680b6e7c32082788cedd15e78b4963f9b5e
-EBUILD abuse-0.8-r1.ebuild 810 SHA256 384337cf21bb79297ee883fae6dbc8447a38f80b8262f354e0e6459e33da339e SHA512 d973fd905ba196a9dd9d291682943d667a175dbcc51a95c41df0166868166527a50264273e34f18aac7788286cf522dec67a8e3638142fe34569a9c7265f01e3 WHIRLPOOL 1b2d3982c6844fbbc38abbab27bf402e3789ef23ec74df58d81c02c63eb3e3d0946a443226ee508c7226dd03027be56b0d37f38b91984621b213027460a51a25
-EBUILD abuse-0.8.ebuild 922 SHA256 add10ac15eb81a1794ae61945d1a6698338146ea9261864bfe35b4692b82b372 SHA512 d6540d8ac5ae7c71f56a24c5a551b2aa4e769d33d428df68a84d8ae66ee2dbd45b826faf4f39c1aff39aa75a5148efbd2077aab9d196950c8d163d76418edb98 WHIRLPOOL 6c2aba3344cd363e38ba3c11942f0e3e149d0c9264aff4e242427c124362716c4f7866a8e6066b74922028ffce1124d9d2f2e04fe9e2cd06cc479fb1f7ff3817
+EBUILD abuse-0.8-r1.ebuild 818 SHA256 bbd5d7bcfbd64c9e8dc126ac645e91b915ca6f1bd458707d0eb670246cafeeda SHA512 b55b5b0763c04306285cdaf628d60a5746395c8f9d7d030ae7fc2cb6be891f8f8c14d681e6e449194205fc83002f961f4007a8325abd204d855481739dc42f03 WHIRLPOOL 79fb5a91e7d532aba7c7f0506c2d179ff8fdf7690a1bdbdeef5b0023713a674a1936282d283bb2c71f193f4ec680e9c0adbeee61af571b86346252322384248e
 MISC ChangeLog 2815 SHA256 b368a04e1e53ad053dc45b0eeef3d0ca149a259467a07bb5669bdb5929f3dd81 SHA512 b90f37d19a1852f15c65444429fc28f7a438855e49e28bf62295c4c69972af25f2aebe0f9e39960000b51d8ad1ba12be5fa915e3c9691035ef51e7985b934284 WHIRLPOOL e5135ae34b9473b1bb0d6fee9e1e92fc5b1dfe600ac785c726b053316b0bbb3cc7be10a219205b380d0574fe8548055744a14b08f4c902f5266192812634008e
 MISC ChangeLog-2015 5880 SHA256 672058838c39d9b57bc25c3762d77fadcbe273950cedc8781d9bf966ebad02f7 SHA512 d741ca077630789f54524e8f5090b2a366ffec3af4f083a5a8195452f90c33baf34017f8c4e282399ee89308d8db7e3be093c3d53d7d9a8d823fe0562bbc7397 WHIRLPOOL 8a894c78c274d422e13b0af07b701063307434119e82fc6ea04e4dfe2a8a30ed5b2b172fd293f66b504fe3d54acec19b7c53e8b03a48deab7865c69de4240995
 MISC metadata.xml 259 SHA256 92bd7c6e50355d43cbf5dd2596bce32ae5e03ce2a4fd46b80751ac74c223fcf2 SHA512 8516e2364a64325b483a394a14c52e32b029beccd05586623e5dba0b861970722c3709070c8fd4b80a23f0a84b74a475485b0f2b05f44fae6f27f163714aef68 WHIRLPOOL 6198c7f0537590368b6bffa019d8c0c8cd03cd49bec4b1917d59b14e7922c4e4f1143ff2e4239f2f7601081c98af6f81f478ffabcc893d5e1ff7851ab990dbfa
diff --git a/games-action/abuse/abuse-0.8-r1.ebuild b/games-action/abuse/abuse-0.8-r1.ebuild
index b43ca930f027..5099dd703aa8 100644
--- a/games-action/abuse/abuse-0.8-r1.ebuild
+++ b/games-action/abuse/abuse-0.8-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools
+
+inherit autotools eutils
 
 DESCRIPTION="Port of Abuse by Crack Dot Com"
 HOMEPAGE="http://abuse.zoy.org/"
diff --git a/games-action/abuse/abuse-0.8.ebuild b/games-action/abuse/abuse-0.8.ebuild
deleted file mode 100644
index d56c20871b1b..000000000000
--- a/games-action/abuse/abuse-0.8.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils games
-
-DESCRIPTION="port of Abuse by Crack Dot Com"
-HOMEPAGE="http://abuse.zoy.org/"
-SRC_URI="http://abuse.zoy.org/raw-attachment/wiki/download/${P}.tar.gz"
-
-LICENSE="GPL-2 WTFPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=media-libs/libsdl-1.1.6[sound,opengl,video]
-	media-libs/sdl-mixer
-	virtual/opengl"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	eautoreconf
-}
-
-src_configure() {
-	egamesconf \
-		--with-assetdir="${GAMES_DATADIR}/${PN}"
-}
-
-src_install() {
-	# Source-based install
-	default
-
-	doicon doc/${PN}.png
-	make_desktop_entry abuse Abuse
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	elog "NOTE: If you had previous version of abuse installed"
-	elog "you may need to remove ~/.abuse for the game to work correctly."
-}
diff --git a/games-action/accelerator3d/Manifest b/games-action/accelerator3d/Manifest
index 872d23d9ff15..8b40a63d09a0 100644
--- a/games-action/accelerator3d/Manifest
+++ b/games-action/accelerator3d/Manifest
@@ -1,8 +1,7 @@
 AUX accelerator3d-0.1.1-gentoo-paths.patch 3073 SHA256 bb32e3e63886acb6ed84372b1edecfa5160b823344c560ce5a1e5a1b59e3c0fa SHA512 176b46b537c65319cc611159fc6dda6b6d21858c101d491a54c28099522d9a5a06fd6d07b84b70c1d8bfd30c591a61ad3a5e3d72ce5415760f18c828c42f1e56 WHIRLPOOL cd5c148414a7c8d3e59606d2cefe913daa526e2a1bc65cfa7dc518d12649db961afa2e4191bff0230b6db32b2a83b597375277a55f08d7310480c9f9d7871149
 AUX accelerator3d-0.1.1-gllightmodel.patch 574 SHA256 16d00f15359289a009b716dc0f0e6044229c3190a7af33c456dd34d69b4235b7 SHA512 e6364093194560e1834ea52b943bb01f5b1e2990ed5b087c30a1c756a7f44857bfdff908ade0f67c1c8047cff82f2c7e4b660968cdf82a90012f00c2ccef5e7b WHIRLPOOL 2b6be2ae59087b23d9d65100966236418d112a0bffbd85dd4a99a77a41fdfc8ce06c5184e260890685273ad30a55e3fb4f4ffa5a7fe935bef31ec60aba14c27c
 DIST accelerator-0.1.1.tar.bz2 1183838 SHA256 02fac1b6fc9bb5708f53ef7bcf123f5a4a04261e2764f984d3e3c64e06a74712 SHA512 f4321beb5f5b61c10d0b275321641ec173636267ae08cf88f7a2ecaaf0799cfe6593cbc7343c8ebfa72853c59773841295b1aca9a0ac0ef510de390107aa01da WHIRLPOOL e6d705361e24cd8eebabaf4c3a8b3ba803ea8d897ff93a48f3ec2f300d0f6ed0cf57b2ef036dd8e8bf031c6ab03ff6c97ca59f013400376a91d291270b0e14f0
-EBUILD accelerator3d-0.1.1-r2.ebuild 1114 SHA256 3bb3f4fc346cdb6ce23f2bcc9cdfe5cfccff63cf2df916304ca8cef82578866c SHA512 eaddb1d524f40fe2f60b1312b83d41e1a1c83872da86ceef08b276aea470d4560b84fc180f144f594edfe9ae83ac7ebfbd3d9bce91b553f2dd6873cce322cc58 WHIRLPOOL 3d32449c134db64ac579e4ef7aa5732696d4a11bb1e96f61a7af075866f3cc1b727042a225ca7e0437bb4b12b40386c6594888fabb89d664ece963c22b84e6ef
-EBUILD accelerator3d-0.1.1-r3.ebuild 1052 SHA256 5facb89a9d7738c87b88cab8b7b0ab1ff05eccd5d97949cfb94974406b4aaa7c SHA512 6ec8f437fc4f6c6ffadce44b07ee5c68aa18cae855bf3d2448c7c168fcb1355f76ba0f9da250c320f107661ada874cc9a284209a06b9dfc7a4ff3878e6623dc4 WHIRLPOOL 54b3a7ac68d4d5105efbf98d7b3bdadfe6bff5295e66405f99619105e33d8c6fe25008139818ffac2678fcb837f8308d459d4ca4605be54948364c391e44b9e9
+EBUILD accelerator3d-0.1.1-r3.ebuild 1057 SHA256 08956cde774e43c53d460f08bee88f63383b886c43a05bd847251ebb761bef87 SHA512 dc714c64480520e86e66f18a46edcd020b742271d90d8a2eb1908a216bf53ac76a936fa754baf33a3b14c0357a774d0833fc76b768115bdbf4be576046797a2c WHIRLPOOL 57c179baeba8d208d8a36837eaf2e7253d76855f2ff84ba23c228bd26083a7bc62775eaeb713205cee5af2351442ee048e98b0ebb4f8f25128b435ae2e44ed6e
 MISC ChangeLog 2916 SHA256 55efbb8cbf0d096b6e0e9bcefda2f86bdbe798e61025c9f4037b7ac318200ab2 SHA512 29335484a2ebdbed0cdfbea8c47a802b08ce3a1dfcc942b2343373f18c4b000ef7d08de12abed5ad3a9fbf868294872110f82a52f6794561d6bcb6803658f782 WHIRLPOOL 9c669568c77567c1dc13e48bcf4e2a58ee9c4406d5476bf39774a47f8da594c3a6c0936ba3b8868752a29177331ea5e6cda9c4752a82add02f7121a418de5740
 MISC ChangeLog-2015 2364 SHA256 906ffa1fd2834d63c2af9d2217b5bb844db7b9b04a5e292631589c151429bbcc SHA512 675ef2ef31e830a265ee880b6308952ea7b9cb506f11c8ebc5b2a61747750fb4b90d4222798cc9241acb2c439dc1433360d6eca97affd718d9dde96034a3eaab WHIRLPOOL 8edf10f5c434e554ab3ea9b5a5099efc7328ed3e8cf288fd25849a046d6ecd8987ac8ce5230835722f9bdfeab99094b151023ef9e10e8ea98db7ca4c6c377d28
 MISC metadata.xml 336 SHA256 85edd80593d37f2bade06424c8d89a364b731a84397e29649d935ffbb00186f6 SHA512 a5f747c0ca0e4a9b14d09981181248de38c92175f80c96ad368f04033c4782e0ae0ae84af6604ee8ba0d6e438d395e4101a62fc5eefcfbef0cd003e78978c51c WHIRLPOOL 6dd6538b03b67cc7093420933e61f7f7eddf32545261abda400fa318cc121b5cbe95d49f4539634dad0c81b9d296fcc5d7075f2017f46a752ec06df2628af485
diff --git a/games-action/accelerator3d/accelerator3d-0.1.1-r2.ebuild b/games-action/accelerator3d/accelerator3d-0.1.1-r2.ebuild
deleted file mode 100644
index 89a2b11fe697..000000000000
--- a/games-action/accelerator3d/accelerator3d-0.1.1-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-r1 games
-
-DESCRIPTION="Fast-paced, 3D, first-person shoot/dodge-'em-up, in the vain of Tempest or n2o"
-HOMEPAGE="http://accelerator3d.sourceforge.net/"
-SRC_URI="mirror://sourceforge/accelerator3d/accelerator-${PV}.tar.bz2"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	dev-python/pyode[${PYTHON_USEDEP}]
-	dev-python/pygame[${PYTHON_USEDEP}]
-	dev-python/pyopengl[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-gentoo-paths.patch \
-		"${FILESDIR}"/${P}-gllightmodel.patch
-	sed -i \
-		-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" \
-		accelerator.py || die
-}
-
-src_install() {
-	python_scriptinto "${GAMES_BINDIR}"
-	python_foreach_impl python_newscript accelerator.py accelerator
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins gfx/* snd/*
-	dodoc CHANGELOG README
-	make_desktop_entry accelerator
-
-	prepgamesdirs
-}
diff --git a/games-action/accelerator3d/accelerator3d-0.1.1-r3.ebuild b/games-action/accelerator3d/accelerator3d-0.1.1-r3.ebuild
index 38ae98f25014..1a5d9737b89a 100644
--- a/games-action/accelerator3d/accelerator3d-0.1.1-r3.ebuild
+++ b/games-action/accelerator3d/accelerator3d-0.1.1-r3.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 PYTHON_COMPAT=( python2_7 )
 inherit eutils python-r1
 
@@ -13,7 +14,7 @@ LICENSE="Artistic"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
@@ -32,14 +33,15 @@ src_prepare() {
 	default
 
 	sed -i \
-		-e "s:@GENTOO_DATADIR@:/usr/share/${PN}:" \
+		-e "s:@GENTOO_DATADIR@:${EPREFIX}/usr/share/${PN}:" \
 		accelerator.py || die
 }
 
 src_install() {
 	python_foreach_impl python_newscript accelerator.py accelerator
-	insinto "/usr/share/${PN}"
-	doins gfx/* snd/*
-	dodoc CHANGELOG README
+
+	insinto /usr/share/${PN}
+	doins -r gfx/. snd/.
+	einstalldocs
 	make_desktop_entry accelerator
 }
diff --git a/games-action/armagetronad/Manifest b/games-action/armagetronad/Manifest
index de3af9b0908c..bbff97db323f 100644
--- a/games-action/armagetronad/Manifest
+++ b/games-action/armagetronad/Manifest
@@ -1,6 +1,6 @@
 AUX armagetronad-0.2.8.3.3-gcc6.patch 6419 SHA256 37d1632aafc10405607c28e35be826d3680a2d5f02844f22c9fb4a2fa1cc11f9 SHA512 ff56e2388b56736fddd1a4fba94914a3d327c11b25675a45f930b1ceab215cd197563194aa6485571ba5ee7c4ed6e2644da9f81f70cc686201a8efbed9149a44 WHIRLPOOL 2121a59a1199924cdd24a705b0dbd64202425b912fff59252e9b73dfe9faae5a3f59cdb0e206b776e280de426848d553bc7f70dbda0debc88ff33dd79bbb8954
 DIST armagetronad-0.2.8.3.3.src.tar.bz2 1857868 SHA256 ddf2d781b134392e9667f17e0319ae2117c20e6eb7738e3cacd701f3608ea5e8 SHA512 05dd7db10efdac0e681133d07384b0e3c2edea328433f1d906e36b5f70960bf502df8d496967981b6bd67e1a119af9a5bbd71b0c824f790921deb3165165dc3f WHIRLPOOL 731b3e8d8647948e016e4dbfa3733f666838d0b4e47f997e149b947741d3b566d9aa1492dc570064e0005c92b0c04f4c74ad4a0278ff7018b028d9c431af135d
-EBUILD armagetronad-0.2.8.3.3-r1.ebuild 1485 SHA256 db3f5e6e7372eff7f46261e21a105f3c01aa468f996b1c4a7e4a99af0aadc34d SHA512 84cacf55f04d3ec6d1ec61334d10013798d1774a52146f8144f9d356d1ed61737b6bf59a3cab2d1638c412042901099f020493ff07e5e61d04132f4921bb56a7 WHIRLPOOL 9abf36ce7112fc55d2ea5e5e48ac539a3f5ca28f8ba85894cad042cd140a23b186e3a5660db72f23892ad52bdec2fbf10778a5ac4b25ffe1afdcbdb8d9cf08b8
+EBUILD armagetronad-0.2.8.3.3-r1.ebuild 1321 SHA256 3a9834ae292cd118e0d7a12158415b7b61d0d4d26ba31f2e6de505e02db447ba SHA512 9fd7a73fc82c802189bb4e379d26c87807508fc3631adbe6c1b2a4f35d82fd97f73fbce7455d8d8020780ad6ee766d1875f32a4bbac6b1f8d37271764ad3d1f6 WHIRLPOOL 4320f8291b47cbfa5beb68c3eda6d007638bd17b51c0d41eb75deb00ea40377b95fa0c0154cff15b6fa5aaa52a780407689bd54a13992447511b56cc30db36fa
 MISC ChangeLog 3575 SHA256 6ec87dce0132d641ce6b1dd9a6f69a0c24e5638cfdf283a62934c9daf630d675 SHA512 782b3120aaefc04e59069957624959469dbaec1710341c617a4e61e85d4d8376caf79374cadf1c15ffb96cad5db239caccef65fb8c0369e7509099ed12230eef WHIRLPOOL 69f886d01f7d28f6b15d0fa5ba48dfad0044d8a731996eaf60474c1da2552c1707b34a66af93d378317c5833a06c07b86b15220aa6cc2bb876feb21be6c35af8
 MISC ChangeLog-2015 892 SHA256 d6c76f15935c6095c7a3dd2aa7f71e93ba667e749f12e7e7afbfaf4cd4ac3a57 SHA512 ffb2f246907f010ee1ed760b4aea0e667ca2dd8e3a0d1e403299ea7538260ade921955d48158a14af87a4942e5131de1a8a600887c8114d8d61a8d4a9ffca950 WHIRLPOOL 58b8922d097a45ffa414ede2ad6d629789dc18696d1b60724e7a4e64b4cccda25bec75c8dd4a39748fec08670f1e4bf92213cbe1b4cea60ecef324906c1b9ea1
 MISC metadata.xml 333 SHA256 f4208adff17bdb0920d2c0cdcc1c3d004344d67364e979296867c74e07a8020f SHA512 ead9b44190ac80607b29eb37c771f7ce041cdde47e1e8203201d0e616ea78377312101dbf1ed6a508c64a884980506c96cf77dbd8a4d05f0a69ecd807fc40ead WHIRLPOOL 028e5ea73e2646689cf0661fafa341a925ea5a9d93dab619a0e3854c042adda3ef848a041645ad111b5ef8060528b9b06475bc0c1aa79d567fd387ecbe2c8c63
diff --git a/games-action/armagetronad/armagetronad-0.2.8.3.3-r1.ebuild b/games-action/armagetronad/armagetronad-0.2.8.3.3-r1.ebuild
index 7aa64769890a..9147b2111608 100644
--- a/games-action/armagetronad/armagetronad-0.2.8.3.3-r1.ebuild
+++ b/games-action/armagetronad/armagetronad-0.2.8.3.3-r1.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 inherit eutils gnome2-utils
 
 DESCRIPTION="Fast-paced 3D lightcycle game based on Tron"
@@ -16,15 +17,12 @@ IUSE="dedicated sound"
 RDEPEND="
 	dev-libs/libxml2
 	!dedicated? (
-		media-libs/libpng:0
-		media-libs/libsdl[X,opengl,video]
+		media-libs/libpng:0=
+		media-libs/libsdl[X,opengl,video,sound?]
 		media-libs/sdl-image[jpeg,png]
 		virtual/glu
 		virtual/opengl
-		sound? (
-			media-libs/libsdl[sound]
-			media-libs/sdl-mixer
-		)
+		sound? ( media-libs/sdl-mixer )
 	)"
 DEPEND=${RDEPEND}
 
@@ -38,7 +36,6 @@ src_prepare() {
 src_configure() {
 	# --enable-games just messes up paths
 	econf \
-		--docdir=/usr/share/doc/${PF} \
 		$(use_enable dedicated) \
 		$(use_enable sound music) \
 		--disable-sysinstall \
@@ -48,12 +45,10 @@ src_configure() {
 }
 
 src_install() {
-	# FIXME: is the -j1 needed? https://bugs.gentoo.org/588104
-	emake -j1 DESTDIR="${D}" install
-	einstalldocs
+	default
 
 	# misplaced desktop-file/icons
-	rm -rf "${ED%/}${GAMES_DATADIR}"/armagetronad/desktop
+	rm -r "${ED%/}"/usr/share/${PN}/desktop || die
 	doicon -s 48 desktop/icons/large/armagetronad.png
 	make_desktop_entry ${PN}
 }
diff --git a/games-action/atanks/Manifest b/games-action/atanks/Manifest
index 21f18308b1f6..15bfe42c532b 100644
--- a/games-action/atanks/Manifest
+++ b/games-action/atanks/Manifest
@@ -1,6 +1,6 @@
+AUX atanks-6.4-fix-build-system.patch 579 SHA256 25c3666380d708eb0af6a8d88dcad9c7d13e1d02f922c0ffb851947236feeb63 SHA512 86b046c37de4ff24f30dce799f32674d33930605c9da32a1c95e8438f6573e66f46455cbf371f66a1b4d8240c608dd338376be150bab59d4048bb46326f82daa WHIRLPOOL 479d96af4a856ea4753bdb9ece3fe3cfaf0ed92b92f75175b1c267317c5d5a02d8ffc2add264e263b81d78dc41c1ffe419d4ebd2c75aa1b2f0a536bb6a48cacb
 DIST atanks-6.4.tar.gz 6059315 SHA256 ea5b560fb15872f7329a1f70d749c93cf553eeaa02480108e95c1664b85f049f SHA512 e9410e5bf0e8ec0281718ad8ddca74b67000db96b09b6af8aa906bbf2cd815f07ff550087ecdee2e4c5bfabc42941f184173f35e50538e57bb008372a599e1e6 WHIRLPOOL 25b59cf4592f526cdfbac4cc26b386571e658c8d0493a49790ffbfffe15d16b2796bf7a6684cdb9fad6de9c46d9ed544991469c3cf88a4ec24e4ba2d27c7db3e
-EBUILD atanks-6.4-r1.ebuild 823 SHA256 198d1c9e63dae77c37fe0848eaccf6291b825a21cfd3b3764f0675269c77a9e8 SHA512 bc63e49f283c261abbd395c1db469ee1fd317daad3918ab03fd313980a5e8477b03cf2849cb71c7f8d4fa600fb2ffebda50467fb6aa106296ac0f71815176965 WHIRLPOOL a30c1d3878f436e3fb1ca90ae7d8466189cc1dd1567cd87ffadcd40784b0f5c992516480201936f4460bb56c15c5d3fb0fbc35e6c41a27d25795ad4439a29eca
-EBUILD atanks-6.4.ebuild 931 SHA256 3c0d879d00b4378dba7ccd9256054b9e85e5162e46fb66869a68973e5640c085 SHA512 8374a1caeda9c45c42a15343ae38bce6cf7e656aac1c090c7889890971009356b8974ea7d845ce0d3505221a24733775ca4226609ed7280a1b544ae7dcd0e5cf WHIRLPOOL d6a495aa0d8e854b78f39613a9031e513f9516714b41e5aec8eade416a6c9534681953c6ef7f889840baba4c7faaf7868da6c6b95ae18785a9b44f8290306882
+EBUILD atanks-6.4-r1.ebuild 971 SHA256 0b60c2cabef557e5975f1d48027787974e0f464dd1849bdb0fd99fffc97141cf SHA512 6b855aacfec1311d5c85bdbbf1607829c81183e15e3fbddcd2177492184eab1b94c1d250e3b269783602e4d0e37bdc8da1664a944ed8cb6bf586eea45950caba WHIRLPOOL 3ad58f2b234a3aabc19f3ddf13e5fb015a62f749c49ec4e02e0e1405709064973476d6750bdcbb8f09b07dd2a48d848bd52fe02998e692b6ed5ee6f457d10d5a
 MISC ChangeLog 3629 SHA256 17cbacf7c2743d010147ff98e977457a2447b741d67345a954ceeaeb10245920 SHA512 875d1002c57ba5b6f2c49969a8f3847c0ecbf6b35936483c7ea20fe084a379c30995e23c90cabf66fdc93bb164cdbafd4ffc20dd3499aa031b7b3392bcae3e4b WHIRLPOOL 0a4ced9853ff26da442be247829237e7c8b8232e1ced4f2ebca91f961616dcd3e2e6068f3e777bf308853143ecee0c94ec7b5c79fa3763479b5bb6f4f28ec4ce
 MISC ChangeLog-2015 12507 SHA256 70d3a059429b5533dd3c1eea274a1628ccf0674967c8673c679fe3cb9493e057 SHA512 35638f00cc8dea853c00173ffa03132dde6d9f68910535ca42379923f35c19b7f5bd16d082929987a212e0e20249763f2f33d78935b3e3bc86f63b09011f9474 WHIRLPOOL acf3ad3fca668b7fde848e29ca2b526964a906237884cac28961fb21c1e3e33761c8806cf7e5c3484e29817eedaaffbd3c367ebd9573ff4f3e25b8239d727609
 MISC metadata.xml 329 SHA256 8029cb9e6ca02cf957a4ee5e12934c1a64fbc43d69a5ad91e698761e3c64f387 SHA512 1dc2914fc7dfe5c7f87ac565b6183b50d281fdf768e05cf211309699a264fde8a3e434ed07049b984e6f116256fec2124ed458ccfc70374ff35ff3189ec57917 WHIRLPOOL e459c4118514a09296003c000111e5ed69398413e9941c4bbdb2f38f1d53cf60ec6253ca0f7fe4a576fad6b8f095cdff0c8830eee5c845959e7a6c43521cd72e
diff --git a/games-action/atanks/atanks-6.4-r1.ebuild b/games-action/atanks/atanks-6.4-r1.ebuild
index d17df9c83dc6..ed2deed79042 100644
--- a/games-action/atanks/atanks-6.4-r1.ebuild
+++ b/games-action/atanks/atanks-6.4-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils gnome2-utils
+
+inherit eutils gnome2-utils toolchain-funcs
 
 DESCRIPTION="Worms and Scorched Earth-like game"
 HOMEPAGE="http://atanks.sourceforge.net/"
@@ -16,18 +17,27 @@ IUSE=""
 DEPEND="media-libs/allegro:0[X]"
 RDEPEND=${DEPEND}
 
+PATCHES=( "${FILESDIR}"/${PN}-6.4-fix-build-system.patch )
+
+src_configure() {
+	tc-export CXX
+}
+
 src_compile() {
 	emake \
-		INSTALLDIR="/usr/share/${PN}"
+		INSTALLDIR="${EPREFIX}/usr/share/${PN}"
 }
 
 src_install() {
 	dobin ${PN}
+	local DOCS=( Changelog README TODO )
+	einstalldocs
+
 	insinto /usr/share/${PN}
 	doins -r button misc missile sound stock tank tankgun text title unicode.dat *.txt
+
 	doicon -s 48 ${PN}.png
 	make_desktop_entry atanks "Atomic Tanks"
-	dodoc Changelog README TODO
 }
 
 pkg_preinst() {
diff --git a/games-action/atanks/atanks-6.4.ebuild b/games-action/atanks/atanks-6.4.ebuild
deleted file mode 100644
index 50382f26af2c..000000000000
--- a/games-action/atanks/atanks-6.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils gnome2-utils games
-
-DESCRIPTION="Worms and Scorched Earth-like game"
-HOMEPAGE="http://atanks.sourceforge.net/"
-SRC_URI="mirror://sourceforge/atanks/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/allegro:0[X]"
-RDEPEND=${DEPEND}
-
-src_compile() {
-	emake \
-		BINDIR="${GAMES_BINDIR}" \
-		INSTALLDIR="${GAMES_DATADIR}/${PN}"
-}
-
-src_install() {
-	dogamesbin ${PN}
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r button misc missile sound stock tank tankgun text title unicode.dat *.txt
-	doicon -s 48 ${PN}.png
-	make_desktop_entry atanks "Atomic Tanks"
-	dodoc Changelog README TODO
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-action/atanks/files/atanks-6.4-fix-build-system.patch b/games-action/atanks/files/atanks-6.4-fix-build-system.patch
new file mode 100644
index 000000000000..e13ebb1d1421
--- /dev/null
+++ b/games-action/atanks/files/atanks-6.4-fix-build-system.patch
@@ -0,0 +1,28 @@
+* Don't try to find where $(CXX) is, just use it
+* Don't muck with CXXFLAGS
+
+--- a/Makefile
++++ b/Makefile
+@@ -85,13 +85,9 @@
+ # ------------------------------------
+ INSTALL := $(shell which install)
+ RM      := $(shell which rm) -f
+-CXX     ?= g++
+ SED     := $(shell which sed)
+ WINDRES :=
+ 
+-ifeq (,$(findstring /,$(CXX)))
+-  CXX   := $(shell which $(CXX))
+-endif
+ 
+ 
+ # if this is a Windows target, prefer mingw32-g++ over g++
+@@ -231,8 +227,6 @@
+     CPPFLAGS := ${CPPFLAGS} -DATANKS_DEBUG_LOGTOFILE
+   endif
+ 
+-else
+-  CXXFLAGS := -march=native ${CXXFLAGS} -O2
+ endif
+ 
+ 
diff --git a/games-action/barrage/Manifest b/games-action/barrage/Manifest
index 90c9c1765944..67073d92a451 100644
--- a/games-action/barrage/Manifest
+++ b/games-action/barrage/Manifest
@@ -1,6 +1,5 @@
 DIST barrage-1.0.4.tar.gz 484641 SHA256 ad74e049dfded3bca28b8dc1c5870408cfad9e024b35cc5b501ba90486d9af25 SHA512 c866c0b98541c0c878ff015d99a2ae62e123c8095e94f64ef5aed26d68b734432110181c11a5b429d4feb808b2b276ac94295ff2b23ddfc64a8790d04a89a966 WHIRLPOOL d54022bd246ee22058e46d3d7add739d41dacc78be13030159c2463429057a19a149c687ccb25cd1385704f5f291b6cd697a900d3a8851a18a833f911ea9e188
-EBUILD barrage-1.0.4-r1.ebuild 582 SHA256 8696efd0e47e463c96a63bd6e81587f983b4adf817740e06e7deeaa5d8f22bce SHA512 cc3cd5d63833d5e1772c176f2a2a3e7a1df580f519cd84381f060af6ca507a332a4ab8c05790f083ffa1324298e8315de3a1676cffc079c039fd40890b554f29 WHIRLPOOL b95c31f34d6ef0e4442728d8bbc0879ac916bdb021c702998a7f2b70b5d6a6b94c0187c7bb42b8f512297d8e75eaefe2cda74ada013f866d16d78d4b27db6021
-EBUILD barrage-1.0.4.ebuild 670 SHA256 6629a3fa65bb15b28c134e5b784e62653adf6024616fc9fd2fe3e73c0ba960a0 SHA512 98bfd5ae25647f50a02202811d7ee8e76219ba42547b7f0a1923f5eb099cdfb54c93542e1dcb2fac7639c31b7e34a29ebe94d693262a3d2413dd21dcca0ed83a WHIRLPOOL ebbd73a1406cb866b82ce84fa49ea4a503214d992c23663db49857ca4d04d5d73462934a832c41192b1d06c437ad955906a2eebc512e3e5248797bd5e97b1404
+EBUILD barrage-1.0.4-r1.ebuild 596 SHA256 bda8fef7afe2bfadf9ada3942f9746f5eec9e370e0d441a91ed0336e301fdf58 SHA512 3e2af1687622eaefedda47536f940f3426e66151e15aaf678c12bba4818ddff42b097ed3fb492810463fb608ce205edf0b1e9c6eb15f40a49b4cc3ac80b5f647 WHIRLPOOL dcbd2d27a3781c24e6a04506158344c49a1057fb3986ef1d929bd78663c02e536f3dea50d5bd15ff63820a789cd9d4b4df2ee46d47789ab4503879f4c4429ce1
 MISC ChangeLog 2808 SHA256 0ebff7e20092bb29ea36f8bf98e707a65ac52b534e8cfed6f1d9f03f799bee8d SHA512 2717c73626921b0c30a6d88c6eca6e93119130f6c7adeb81bb2518bf8c1aaac72d6aaf64a6aa68ca4372710213bb120c463da600d62ade18b99c14cdde502479 WHIRLPOOL 1a0185826f33eb9c85a778a4e5c6474e97861484ed933e57d084eb985cbbff594f6985e3f14bb559673e940a7c2618ccb403797b9c57ca80db55566c6738f59c
 MISC ChangeLog-2015 3186 SHA256 f6a9f296ae92881b6d958c710e8d33c98aa6c9ff26578500e4a8f3bc0bb07911 SHA512 8a7b04bfc5acbbd84f5fa459bb7d40c74c6b74a6408b29b9fd5292acd98eee2f7480f6c2ada20f3d7a141300baf794f48758fc609bee0c33e26d62386cba345f WHIRLPOOL 1620e4e6bfc4a2641dacf17853adb0b2a27f5c91150fad0907c508b2d651fd563c9522f4da8d314ac37e40e897a201c12168842f4dde482fd1a23db30e893606
 MISC metadata.xml 329 SHA256 677366ad46dc60999490d23fa85e7d6f2e04596caac98deb8a04d1dc224c7932 SHA512 2439299362958450ac88f39ba8332cb84d42694d471f79cf8a6b9d38ecc96fa629b91530dee7c50aa23fab5e5a0155cb92cb3a8131a1b69e9375f114da86b463 WHIRLPOOL 65e6d198fb2ebd6dfc0038bc37d6f11c5ae44e60f5db9b641d40bf2248abf21e7e6e7bacc2109a42c16be0e092ba37708baa53b8c166efff2fff4db8e878f105
diff --git a/games-action/barrage/barrage-1.0.4-r1.ebuild b/games-action/barrage/barrage-1.0.4-r1.ebuild
index 16aeec97af84..fc4dde6e54ed 100644
--- a/games-action/barrage/barrage-1.0.4-r1.ebuild
+++ b/games-action/barrage/barrage-1.0.4-r1.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 inherit eutils
 
 DESCRIPTION="A violent point-and-click shooting game"
@@ -13,13 +14,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=">=media-libs/libsdl-1.2[sound,video]
+DEPEND="
+	>=media-libs/libsdl-1.2[sound,video]
 	>=media-libs/sdl-mixer-1.2.4"
 RDEPEND="${DEPEND}"
 
 src_install() {
 	default
+
 	newicon barrage48.png ${PN}.png
 	make_desktop_entry ${PN} Barrage
-	rm "${D}"/usr/share/applications/${PN}.desktop
+	rm "${ED%/}"/usr/share/applications/${PN}.desktop || die
 }
diff --git a/games-action/barrage/barrage-1.0.4.ebuild b/games-action/barrage/barrage-1.0.4.ebuild
deleted file mode 100644
index 3b4694483f06..000000000000
--- a/games-action/barrage/barrage-1.0.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="A violent point-and-click shooting game"
-HOMEPAGE="http://lgames.sourceforge.net/Barrage/"
-SRC_URI="mirror://sourceforge/lgames/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=media-libs/libsdl-1.2[sound,video]
-	>=media-libs/sdl-mixer-1.2.4"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	egamesconf --datadir="${GAMES_DATADIR_BASE}"
-}
-
-src_install() {
-	default
-	newicon barrage48.png ${PN}.png
-	make_desktop_entry ${PN} Barrage
-	rm "${D}"/usr/share/applications/${PN}.desktop
-	prepgamesdirs
-}
diff --git a/games-action/battalion/Manifest b/games-action/battalion/Manifest
index 48ef30afb62a..a0689e610071 100644
--- a/games-action/battalion/Manifest
+++ b/games-action/battalion/Manifest
@@ -1,6 +1,7 @@
+AUX battalion-1.4b-fix-build-system.patch 1899 SHA256 b93c61b585fa374336097d38bc491eb0bcf60370c9337e54abf6f9d4c5cb4e11 SHA512 66248fee82a88f416d255ff7e23c5ffeaac6a10bca22b93231645f9c9923b18df339dea2e38f6b4ab0a5189ce2650e7e21813060576ce1f70fe5e7c29d0f0bb0 WHIRLPOOL 66dd06ab3f0cff00cfde9e3741b04b0071129eb595cdbacd2fa55620990e0d04c0776a84b34fffada9837281d37cf058f72c6fe6c0f4b2f5f05d5a3b96387934
 AUX battalion-1.4b-warning.patch 490 SHA256 78c09c947112102773f27a7068f2bdc535a77ba72c855a0246890f0b1ff76efe SHA512 ba216b192f454b07b14891dbc6c412b301257a91546b77c1e2053324248243422bfac43794849f44068afb65919958f466416d39826248b28dc71a644a1ee660 WHIRLPOOL 962781748a7abbf780b771c91c4a6ca0e65294502ff4872f9b0bc463cf785f7e3d016861ad2bdfe6ed0baab8dc6803491b04471fd0a2898c72d8b58a752844d8
 DIST battalion1.4b.tar.bz2 942342 SHA256 983db152b44b33396ab242946b51d33c405e0bef8649e2cc9e38d6229d9735f7 SHA512 c3c615772012c63a709aaeaf4f23246760bf577b82eeec7cf5b2a479c6240fe4a2f839aca50540299ed4bee9b297f61fb8b7e1f5af74ea357f0d7e749d86f84b WHIRLPOOL 4816460b6e07046934852ca7c079f13eca05827f34b19c13b00f98ced0caa57e848b9d1f3badaa31a82a0dcfba61a9591d70f815cb83596a6901728fd45088c5
-EBUILD battalion-1.4b.ebuild 1632 SHA256 cd1e3694c57af5a3b2a30a12acb10c7bf66b73e308441b21410069dd332eaf6a SHA512 82d61a18b52f2ad2a6685c6b274ebd1587d4c9f4e2e4d597bc5f5985a66ea7ef544b02dc958424d1d47829e77bdec3aca2ce552ea216e624d9698c896bea7f43 WHIRLPOOL 4420ff2f40ff7161ef7e939022d01f0c4348d881539a5b71780ae66d32b35adaa9a3a8a9c76afd2489ab270f5e38cb9c9faa239f3eb99c483288a18fbfffba6b
+EBUILD battalion-1.4b-r1.ebuild 1545 SHA256 44c40f4a33b5b373873550377ff7ef54fa45c9920339afe740c61d02207e8b53 SHA512 2c2a348a748108e648a439d3aa3a2c8ba3828ff8acbdce855a32b0f5e892a04c0db0de24bb3ba6a07254f1c8472ab0959ae000f1359390fd571d491f5e725830 WHIRLPOOL 700ff8b373d72e53163b1ba5101fcf9e157b521464d1c0e9a75fbb406cd567bf6ced43d7a9a9906b80c1d09ab1b01b839b281f4dc064df43d810beac29632617
 MISC ChangeLog 2472 SHA256 a9f625f6e1b9488dfacbbfdd7cf40c7a0bf2a3cf9acf3bd77f549c20adbae4f2 SHA512 a50f34ec2420d9a2b4823fa87db813e4a0ba37c289816457b2ca17033f7a7499f4c38e9f0272875c5fbc03d83fa2ee1e712156137ac088b594eb545a4f59f65b WHIRLPOOL 5f09cfe73e0e2c7328a2d0ff7a9e21ff5630d1ea29e9d6c1060d6cbdc11090844a79c9ba0469e74cf1936ae7235d06027ea79a3cf377664fe0faca1b3e81af4b
 MISC ChangeLog-2015 1819 SHA256 dbcca58416adec02f5f7df1c20a5bed108eba4931e402c80aeb71260c5eb00bb SHA512 ee78de1a2d4a934d37a64d62484ecf1d9691799b732a6f7ffb190724a7fa63b6b925be9246484c90e5977256275a45d564f76e039fff2e27d591577010a53b08 WHIRLPOOL adfc2dbc9fe958b753294cdfc2409d52267f7cc05bbb889186ebd543c21f9dd114476c32ca8f8f03a35c8ae875ecd01c08cb688dea94385bfb77c45c8405947e
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-action/battalion/battalion-1.4b.ebuild b/games-action/battalion/battalion-1.4b-r1.ebuild
index 0ded9a00d39b..d601672cf212 100644
--- a/games-action/battalion/battalion-1.4b.ebuild
+++ b/games-action/battalion/battalion-1.4b-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils games
+EAPI=6
+
+inherit toolchain-funcs
 
 DESCRIPTION="Be a rampaging monster and destroy the city"
 HOMEPAGE="http://evlweb.eecs.uic.edu/aej/AndyBattalion.html"
@@ -13,56 +14,55 @@ SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
 
-DEPEND="virtual/opengl
+DEPEND="
 	virtual/glu
+	virtual/opengl
 	x11-libs/libX11"
 RDEPEND=${DEPEND}
 
 S=${WORKDIR}/${PN}${PV}
+PATCHES=(
+	"${FILESDIR}"/${P}-warning.patch
+	"${FILESDIR}"/${PN}-1.4b-fix-build-system.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-warning.patch
+	default
+
 	# Modify data paths
 	sed -i \
-		-e "s:SOUNDS/:${GAMES_DATADIR}/${PN}/SOUNDS/:" \
-		-e "s:MUSIC/:${GAMES_DATADIR}/${PN}/MUSIC/:" \
+		-e "s:SOUNDS/:${EPREFIX}/usr/share/${PN}/SOUNDS/:" \
+		-e "s:MUSIC/:${EPREFIX}/usr/share/${PN}/MUSIC/:" \
 		audio.c || die
 	sed -i \
-		-e "s:DATA/:${GAMES_DATADIR}/${PN}/DATA/:" \
-		-e "s:/usr/tmp:${GAMES_STATEDIR}:" \
+		-e "s:DATA/:${EPREFIX}/usr/share/${PN}/DATA/:" \
+		-e "s:/usr/tmp:${EPREFIX}/var/${PN}:" \
 		battalion.c || die
 	sed -i \
-		-e "s:TEXTURES/:${GAMES_DATADIR}/${PN}/TEXTURES/:" \
+		-e "s:TEXTURES/:${EPREFIX}/usr/share/${PN}/TEXTURES/:" \
 		graphics.c || die
 
-	# Modify Makefile and add CFLAGS
-	sed -i \
-		-e "s:-O2:${CFLAGS}:" \
-		-e "/^CC/d" \
-		Makefile || die
 	# Only .raw sound files are used on Linux. The .au files are not needed.
-	rm -f {SOUNDS,MUSIC}/*.au
+	rm {SOUNDS,MUSIC}/*.au || die
 }
 
-src_compile() {
-	emake LIBFLAGS="${LDFLAGS}"
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
-	dogamesbin battalion
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r DATA MUSIC SOUNDS TEXTURES
-	dodoc README
+	dobin battalion
+	einstalldocs
 
-	dodir "${GAMES_STATEDIR}"
-	touch "${D}${GAMES_STATEDIR}"/battalion_hiscore
-	fperms 660 "${GAMES_STATEDIR}"/battalion_hiscore
+	insinto /usr/share/${PN}
+	doins -r DATA MUSIC SOUNDS TEXTURES
 
-	prepgamesdirs
+	dodir /var/${PN}
+	touch "${ED%/}"/var/${PN}/battalion_hiscore || die
+	fperms 660 /var/${PN}/battalion_hiscore
 }
 
 pkg_postinst() {
-	games_pkg_postinst
 	elog "Sound and music are not enabled by default."
 	elog "Use the S and M keys to enable them in-game, or start the game with"
 	elog "the -s and -m switches: battalion -s -m"
diff --git a/games-action/battalion/files/battalion-1.4b-fix-build-system.patch b/games-action/battalion/files/battalion-1.4b-fix-build-system.patch
new file mode 100644
index 000000000000..fe209e1db953
--- /dev/null
+++ b/games-action/battalion/files/battalion-1.4b-fix-build-system.patch
@@ -0,0 +1,55 @@
+--- a/Makefile
++++ b/Makefile
+@@ -23,7 +23,6 @@
+ # (the program should compile with no warning messages - if you
+ #  see a warning message please let me know about it)
+ # ------------------------------------------------------------
+-CC = cc
+ 
+ 
+ # STEP 2: IF YOU WANT TO COMPILE WITH THE MESA LIBRARIES THEN
+@@ -39,7 +38,8 @@
+ # ------------------------------------------------------------
+ #GLIB = -lMesaGL -lMesaGLU
+ # or
+-GLIB =  -lGL -lGLU
++GLIB_CFLAGS = `pkg-config --cflags gl` `pkg-config --cflags glu`
++GLIB_LIBS = `pkg-config --libs gl` `pkg-config --libs glu`
+ 
+ 
+ # STEP 4: CHOOSE WHICH HARDWARE / OS YOU ARE RUNNING
+@@ -91,13 +91,11 @@
+ 
+ # STEP 7: CHOOSE ANY OPTIMIZATIONS OR ADD ANY SPECIAL INCLUSIONS
+ # ------------------------------------------------------------
+-CFLAGS     = -O2  -I/usr/local/X11/include -I/usr/demo/SOUND/ -I./. $(AUDIODEF) $(OS)
+ 
+ 
+ # STEP 8: ADD ANY SPECIAL LIBRARY PATHS
+ #         (USEFUL TO POINT TO WHERE THE MESA LIBRARIES RESIDE)
+ # ------------------------------------------------------------
+-LIBFLAGS     = 
+ 
+ # you should now be able to type 'make' and everything should be fine ...
+ 
+@@ -106,15 +104,16 @@
+ TARGET 	= battalion
+ 
+ OBJ 	= battalion.o audio.o net.o gprim.o graphics.o objects.o text.o update.o tk.o font.o soundIt.o
+-LIBS    = -L./. -L/usr/X11R6/lib -lm -lX11 -lXext
++my_CPPFLAGS = -lm `pkg-config --cflags x11` `pkg-config --cflags xext` -I./. $(AUDIODEF) $(OS)
++my_LIBS = -lm `pkg-config --libs x11` `pkg-config --libs xext`
+ 
+ all:	$(TARGET)
+ 
+-#$(OBJ): $(?:.o=.c)
+-#	$(CC) $(CFLAGS) $(LIBFLAG) $(OS) $(WHICHLIB) $(AUDIOLIB) -c $?
++.c.o:
++	$(CC) $(CPPFLAGS) $(my_CPPFLAGS) $(CFLAGS) $(GLIB_CFLAGS) $(OS) $(WHICHLIB) $(AUDIOLIB) -c $<
+ 
+ $(TARGET): $(OBJ)
+-	$(CC) -o $(TARGET) $(OBJ) $(LIBFLAGS) $(GLIB) $(LIBS) $(AUDIODEF)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(GLIB_LIBS) $(LIBS) $(my_LIBS) $(AUDIODEF)
+ 
+ clean:
+ 	rm -f $(OBJ)
diff --git a/games-action/extreme-tuxracer/Manifest b/games-action/extreme-tuxracer/Manifest
index c67db5d71efe..a3b84b8f4fd3 100644
--- a/games-action/extreme-tuxracer/Manifest
+++ b/games-action/extreme-tuxracer/Manifest
@@ -1,6 +1,5 @@
-DIST etr-0.7.2.tar.xz 44178196 SHA256 246d4e65f5c1d3f739e27c75f403d277b54f4e1f3b6e09fd1497a13457292417 SHA512 256db82becdc69344e8aca49f74eed49d7cb99d1c44ef4dff78289acc1ac5f1c2d7b161cecb25c26395d2d8a8b88d33d09bbb94254b5c0c132c09eb658cf87a2 WHIRLPOOL 34f76aa40c548e1c5b54c68c8e43c0fb43ecd6c510a58fe80f77ade21326fffc820a794ac68449dfb2e9d1415269e6aa7951c62522c3fe6f02e4ee5557deef67
-EBUILD extreme-tuxracer-0.7.2-r1.ebuild 990 SHA256 57066a00da6f8961f9c2c18c9014e9118a22b4e152b174792afe5782d482b95e SHA512 4321c0039ea6f9597bbe8825a8a058168ecf25dec3b7b4568e8e4b7f798d8d9ffe31efe9b466b0fe6f7b8c59fb86a3021694722a02eb52b4477356ca6d89aa68 WHIRLPOOL 4d574060722936ad47a1e8c76fbd625d5735c6eb29f1a94635ca8c620022af8662b6cfef30e879b6e15cc8e228f34fc658c18d856eb5c16e3bf598bedd936b47
-EBUILD extreme-tuxracer-0.7.2.ebuild 1039 SHA256 215a5fe6250e768eea7a1ec14df458c9851a031ff8f13f8cde3e82518b764e3c SHA512 60f14fce741bdd18af3b10f78d73b8dd52572b699f2fc1fddb7506edfc3d5771bea14e012d874e44fc4d828685aa84879bf8f1afb7693ae75c359e3d22d7193c WHIRLPOOL 053fdb6f5f88e56a6579975168f85ed22d48c9ac1be6d55ff92f7c7188248fe54a2ca317dc4ec8b89459fe23a0751a48a81b8be2b404a52ba512aac59cb0565f
+DIST etr-0.7.4.tar.xz 44179876 SHA256 da9ce3a1b1e56415285163b9ebc67fdb11fca07acd3ab18f793556d996275234 SHA512 780263859ee3510b0c421f10c190b479db62a1268def14f18ecf7ff84c470cf28f1a2b077fcb21d8bd447cde8b3a7f280aced5cd830eb3aa174b3e461e9efae1 WHIRLPOOL be9a22760c55477a518dbae3c71faae45f4683570e791bed97d81298714b46725d314a04f0b872621e093c59a4a32b731669199e20cbb33f87f160e6f54b65cd
+EBUILD extreme-tuxracer-0.7.4.ebuild 997 SHA256 4383331d7182b3ab4b34ec6236221ed1949e792d41934eabcd0648bcbf56afa8 SHA512 c04bd93aeeb8a13726ebda37639627a3a8a20bb72f2252db17b3cadd715d0af60bed9a5d23467289193edbfd663ab76a9585aabd69275407c4c284ecac84c145 WHIRLPOOL c484ec01318c99a60536f65f7784b872683edb993ec7004a0d5cdf96a4f85afe07647a837152991856d71724daa73e88a2f4d1e67f65e67bf07585af52e82d66
 MISC ChangeLog 3927 SHA256 76f0c1468f8d400d6aff5116bdfac0c218e11eb4d451f5a0698efb3639331be6 SHA512 e36d8bdc6b6d70df08cad5980d22f3053e809150734729c8749d2d364e9ed7411d462c9742af7cd6b2f33f73eab28bff068be52de6a7913726de05a429c45c01 WHIRLPOOL 7597c213e757225a02868d919e6bc91e5647575c4aa78e4e076fa1b14585c524d26a899b361c3f3007358e79d76bda9833b5cf343b39ae5c2b744d38a79981ef
 MISC ChangeLog-2015 3696 SHA256 80ba26d2a25a0f6dfa7aeb4df4989ce015e4955d3afce519faa7059bbb568dc5 SHA512 abfa34a886b59154c72e3926ac70f25d5687868b4876c4b7b92ab3559e86ec0c45ddac527c57c51de5bca96bb205465d7dc841cf53ec39f0a8dd3cf7a8613e56 WHIRLPOOL fc8f50f4138f99ae2361aad796395a90f34a09a745e83d936ab2cf8501adbb959e4e88b825979869bdbcd2ea94ac0c0e27391df61f3a3e87594942c02bb4d593
 MISC metadata.xml 527 SHA256 55e83e177d4a5d989adbe0e0972142422edf5dd16f171cd69fd18916be2b90b1 SHA512 b384907967acf80208014d768908547687f0820495fabdb71e938fb07521ab6f7ec017857e92b3cd2f46c8ffd8ff4634bf1bdc6beaa789329c5b5302f2cdc0cf WHIRLPOOL 40a72ff2ff5559ec0bfc07c4f1fafb62263584f419806c4a69b839f4db4f640a26e9d34dd524c85aae08d969f46931a91fd1559766541725f0e12a4a865c9a1f
diff --git a/games-action/extreme-tuxracer/extreme-tuxracer-0.7.2.ebuild b/games-action/extreme-tuxracer/extreme-tuxracer-0.7.2.ebuild
deleted file mode 100644
index db6ed285a191..000000000000
--- a/games-action/extreme-tuxracer/extreme-tuxracer-0.7.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils autotools gnome2-utils games
-
-DESCRIPTION="High speed arctic racing game based on Tux Racer"
-HOMEPAGE="http://extremetuxracer.sourceforge.net/"
-SRC_URI="mirror://sourceforge/extremetuxracer/etr-${PV/_/}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="virtual/opengl
-	virtual/glu
-	>=media-libs/libsfml-2.2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/etr-${PV/_/}
-
-src_prepare() {
-	# kind of ugly in there so we'll do it ourselves
-	sed -i -e '/SUBDIRS/s/resources doc//' Makefile.am || die
-	eautoreconf
-}
-
-src_install() {
-	default
-	dodoc doc/{code,courses_events,guide,score_algorithm}
-	doicon -s 48 resources/etr.png
-	doicon -s scalable resources/etr.svg
-	domenu resources/etr.desktop
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-action/extreme-tuxracer/extreme-tuxracer-0.7.2-r1.ebuild b/games-action/extreme-tuxracer/extreme-tuxracer-0.7.4.ebuild
index 2ccbba5737c5..f6ca77b5dc89 100644
--- a/games-action/extreme-tuxracer/extreme-tuxracer-0.7.2-r1.ebuild
+++ b/games-action/extreme-tuxracer/extreme-tuxracer-0.7.4.ebuild
@@ -14,13 +14,15 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
-	>=media-libs/libsfml-2.2
+	>=media-libs/libsfml-2.2:0=
 	virtual/glu
-	virtual/opengl"
+	virtual/opengl
+"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
-S=${WORKDIR}/etr-${PV/_/}
+S="${WORKDIR}/etr-${PV/_/}"
 
 src_prepare() {
 	default