gentoo resync : 02.05.2018

23 files changed, 161 insertions, 143 deletions

diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 67e595dfb09a..b7a1f3cb8f19 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
diff --git a/games-fps/duke3d/Manifest b/games-fps/duke3d/Manifest
index ccaea0063e54..520c2e10e5e3 100644
--- a/games-fps/duke3d/Manifest
+++ b/games-fps/duke3d/Manifest
@@ -1,9 +1,9 @@
-AUX 20040817-credits.patch 1267 BLAKE2B a9ce551a0a837a0be9b9a7dc5825a0e36a19ac82cbef9d5f2555eb01056d224b84342181c87b00c69e24042a985e61f00174a157900ff55e536bdba33eb6a33f SHA512 a337f40df1bc300110b507f7fd8cb090cef8c3e49d40379c6899a4a0520b80c26c85fca677cfa2a041a3afad84250480bb4611cb59ea0b5072f8074afaa84e3c
-AUX 20040817-duke3d-makefile-opts.patch 863 BLAKE2B 6899dc477f560ec78724379f52fd8b1980be92937b380a4d763a6aef5085103c8232c03b01955746858ba107ab2c5f44d8ce6a31101c60d9a28d90797a5be469 SHA512 6475219290d41cc9b9974c47269237099d08d695f940ecc6bc3c21504a85635a3b934f0755e20b13fb6e3c9444e5dccafbe70474ec5d27fabfdb3ae35ec5d75b
-AUX 20040817-endian.patch 772 BLAKE2B 1914686d4e8a991f9b9ee3d37abbf91c4047c2811cad0567f0b9ddc4d034ccc0506ba6483d7a575b2d411a28f31bf0a0a33efdc19db5f9c818a7b3ca35847ac5 SHA512 4f052ab4328c2d421487479c1cd3a81e108381ad1b7c63a2d8a6366826f72ce631b455558d410fd129fa3584d2a623a8329bc83719726ccc76e7e513f4d16c68
+AUX 20040817-credits.patch 1271 BLAKE2B 9602782518bbc25b92dd72d8c10f57c7842ea97121b642aec2a61a6dcf233a285159459aaaab8c3772eab30fbe049444a4fff4f7bf329f1defeb121b354269ee SHA512 40648806d616846198a990b6e0608c76fe44ddaaa593d855fafa89697f575fe968232939cc28602db60d0e941b9067705b38c5eb66ed0a824ed8007f5d5deb70
+AUX 20040817-duke3d-makefile-opts.patch 867 BLAKE2B c382bbd818ab15173a2d4e3053dcb3c243e54f3e7f1df2dfffae53f7e5d6b320586c431cffdfd0f2311970d35870f5973b80817ce8f1f219a88f6d715cfeb202 SHA512 752937486d8f16bb7ced895b1659571aaa99ae94b14cca543f5c248cd532d52a580d324978a8b71c27e99423cdbad95266b5c58eca6e027c49fbb64ef186c6bf
+AUX 20040817-endian.patch 744 BLAKE2B c1af086ff1d452b356348ed019d743e1ed692cf3e448de55dc4ee741b563dfbdbf22303bb1b952bbf710005736794d5f07d1ec8d756e41cc0d5de39bb5156c4b SHA512 44fe2bc1509f528bc74a542325703a845d0ad9198b102d400108eb7999c73d776c0ed552b98746a5dae4dd4e8bdfc558efe83d7d5e30dac2e211076244fdbe70
 AUX 20040817-gcc34.patch 1886 BLAKE2B 7f8359098d1cbbbe94417ed899ccde72e9fee2316b3120d68d066765ac1e9b8d7d8624d4c1dcbea8f7b146070e4a87514b67af4a333a2f4f1b51a439d9ba5c94 SHA512 96e6ccffaa0334b1acfeb6542cf729eab22be5ea04c8985f5133c3a73d3ba26a568de7de00ff9bfbdc822edfb1b1438740f742d92b5fb3da62887e2aaf3f1076
-AUX duke3d-20040817-as-needed.patch 2774 BLAKE2B cbda76c4f31dd8b8879dd660733f196263440e22788832b428d45742ae6e10af45aafd28998ca8a96336eedfeb634353d50a53d18ac99c338a9ffd7211a7035d SHA512 b2ae1da82658f0602b0270fd9095f5c848faf974170a3a9b761dae8160b60c7874a4587f10a70e657c9d1f1c5dc782cc4ce71a8d6bec84f2a7bc11cdbb91c327
-AUX duke3d-20040817-gcc4.patch 10474 BLAKE2B 40a5f536a087252f71d83cb967297eff5e922f5a0f88ee59d9dade940dc9f7cbb1d8708b375442b6e494648b0c90c31de215d5f02fce71954ae9fe2c7c1d5f3e SHA512 9b368725ae518c01ea449568e700f1e515098608daae0055a66012a6ee4cb1583dd5a252e9782de6db6520820517dc126ae8b51280261f42b14b38ff0e0db4f3
+AUX duke3d-20040817-as-needed.patch 2730 BLAKE2B 86fcfead798ffb14b4399a8d931c93635656957372cc7fdd7e126e0013c03c8de5921e24a4314ef1134af0805475df62f53aa52d5b840f6ba42be7099c04ac35 SHA512 e9032d43edfb03bebd63de8cdd666e2ffd8bd1ec7e45dc2b50f6ca9db09853dba627f66454549a6c473984e610046a48539323a0ec02f2a19e2c3df4d15ceee0
+AUX duke3d-20040817-gcc4.patch 10413 BLAKE2B ddb013a5ff9e48fd7b871fa254c514f33148087c0593fbdc40878e17c339d928f7b497152f32fa17f895398e556cfaf8d2a8c1ea889f26dd5b6243ddd0ac3b68 SHA512 d00c07b987e10485313dea04d4b42bff530275f8c618e46104d435d3f65671d2271dc1c41426d816eddb9c41c0677269d4930f57780b23451355581e48f70dcf
 AUX duke3d-20040817-ldflags.patch 2132 BLAKE2B 2ad5c888753ac91b17209c99a0b97b6d3db0108083d8b98e2c4877f660f9390d43b0ef7260a199819d08e0a8c86e2924f0436d840ba5bf0322d3f8ab8a88da96 SHA512 afdcbc422b98c3c07bc4aea54865f2c7a167838eaa2270109e0066fb2e1db069bf5034bb78c0dd428baa0372465be4614125243a33aedfba19938b8e8f905b27
 AUX duke3d-20040817-noinline.patch 545 BLAKE2B b257119e4ac991f3ce2f7135d387baf40fb7fa168c2a130995916efb03fe0ab2efd170b3f3bfd2748a2716cd7c83f6238075b150205a70ada802c6191e028686 SHA512 aad5543419c762083a908b3905c22efa102cc6d9724a7fb5ee5eab96fd490c1afce632395a53049ec1b6d2123aed1c2440e583994773916eb1268bc75471ea79
 AUX duke3d.cfg 4314 BLAKE2B a6db96d8bf23823ce1df5458248a5a6b5b1ceb3f119bb939206b886311ebe7bedec9d7ff93a509bd7873a57ff9b0b28d5d5b16d1fe5dbb8bc4e7c2d9e6c5c3a8 SHA512 5b4d020d6ea9b5bfdc4333c2a0b90667577662ed32a826263560e74bd436372d689d179290a87c86d921c4accbaa75da013a3426d98f49cc7ffb6a1be5fb25a7
diff --git a/games-fps/duke3d/files/20040817-credits.patch b/games-fps/duke3d/files/20040817-credits.patch
index 176fcd74752b..19eefa4bf423 100644
--- a/games-fps/duke3d/files/20040817-credits.patch
+++ b/games-fps/duke3d/files/20040817-credits.patch
@@ -1,5 +1,5 @@
---- menues.c	2003-08-17 22:16:10.000000000 +0200
-+++ menues.c	2004-03-29 01:59:28.000000000 +0200
+--- a/menues.c	2003-08-17 22:16:10.000000000 +0200
++++ b/menues.c	2004-03-29 01:59:28.000000000 +0200
 @@ -1747,9 +1747,10 @@
          case 996:
          case 997:
diff --git a/games-fps/duke3d/files/20040817-duke3d-makefile-opts.patch b/games-fps/duke3d/files/20040817-duke3d-makefile-opts.patch
index d23f7a118f77..9ed2a0052153 100644
--- a/games-fps/duke3d/files/20040817-duke3d-makefile-opts.patch
+++ b/games-fps/duke3d/files/20040817-duke3d-makefile-opts.patch
@@ -1,5 +1,5 @@
---- Makefile.orig	2003-08-17 17:45:35.948650760 -0400
-+++ Makefile	2003-08-17 17:46:36.894385600 -0400
+--- a/Makefile.orig	2003-08-17 17:45:35.948650760 -0400
++++ b/Makefile	2003-08-17 17:46:36.894385600 -0400
 @@ -4,6 +4,8 @@
  beos := false
  macosx := false
diff --git a/games-fps/duke3d/files/20040817-endian.patch b/games-fps/duke3d/files/20040817-endian.patch
index a22d07fb09f1..3bcdc1379db6 100644
--- a/games-fps/duke3d/files/20040817-endian.patch
+++ b/games-fps/duke3d/files/20040817-endian.patch
@@ -1,5 +1,5 @@
---- duke3d/source/buildengine/platform.h	2003-08-07 12:06:17.000000000 +0200
-+++ duke3d.new/source/buildengine/platform.h	2004-08-24 18:35:05.292291088 +0200
+--- buildengine/platform.h.old	2003-08-07 12:06:17.000000000 +0200
++++ buildengine/platform.h	2004-08-24 18:35:05.292291088 +0200
 @@ -5,6 +5,7 @@
  #include "win32_compat.h"
  #elif (defined PLATFORM_UNIX)
diff --git a/games-fps/duke3d/files/duke3d-20040817-as-needed.patch b/games-fps/duke3d/files/duke3d-20040817-as-needed.patch
index 5eb90fea3e14..c7793a833bf9 100644
--- a/games-fps/duke3d/files/duke3d-20040817-as-needed.patch
+++ b/games-fps/duke3d/files/duke3d-20040817-as-needed.patch
@@ -1,6 +1,6 @@
 diff -ur duke3d/source/buildengine/Makefile duke3d-patched/source/buildengine/Makefile
---- duke3d/source/buildengine/Makefile	2004-05-15 05:15:05.000000000 +0200
-+++ duke3d-patched/source/buildengine/Makefile	2008-02-27 23:10:46.000000000 +0100
+--- source/buildengine/Makefile	2004-05-15 05:15:05.000000000 +0200
++++ source/buildengine/Makefile	2008-02-27 23:10:46.000000000 +0100
 @@ -99,11 +99,11 @@
    ifeq ($(strip $(SDL_LIB_DIR)),please_set_me_cygwin_users)
      $(error Cygwin users need to set the SDL_LIB_DIR envr var.)
@@ -47,8 +47,8 @@ diff -ur duke3d/source/buildengine/Makefile duke3d-patched/source/buildengine/Ma
  listclean:
  	@echo "A 'make clean' would remove" $(CLEANUP)
 diff -ur duke3d/source/Makefile duke3d-patched/source/Makefile
---- duke3d/source/Makefile	2004-05-15 05:14:16.000000000 +0200
-+++ duke3d-patched/source/Makefile	2008-02-27 23:09:57.000000000 +0100
+--- source/Makefile	2004-05-15 05:14:16.000000000 +0200
++++ source/Makefile	2008-02-27 23:09:57.000000000 +0100
 @@ -45,11 +45,11 @@
    ifeq ($(strip $(SDL_LIB_DIR)),please_set_me_cygwin_users)
      $(error Cygwin users need to set the SDL_LIB_DIR envr var.)
diff --git a/games-fps/duke3d/files/duke3d-20040817-gcc4.patch b/games-fps/duke3d/files/duke3d-20040817-gcc4.patch
index 2a37148d799c..3aaf67c6c90b 100644
--- a/games-fps/duke3d/files/duke3d-20040817-gcc4.patch
+++ b/games-fps/duke3d/files/duke3d-20040817-gcc4.patch
@@ -1,6 +1,6 @@
 iff -ur duke3d/source/buildengine/a.c duke3d-gcc4/source/buildengine/a.c
---- duke3d/source/buildengine/a.c	2004-11-25 13:55:21.000000000 -0500
-+++ duke3d-gcc4/source/buildengine/a.c	2005-06-18 18:14:24.000000000 -0400
+--- source/buildengine/a.c	2004-11-25 13:55:21.000000000 -0500
++++ source/buildengine/a.c	2005-06-18 18:14:24.000000000 -0400
 @@ -186,7 +186,9 @@
      if (i3 == 0)
      {
@@ -13,8 +13,8 @@ iff -ur duke3d/source/buildengine/a.c duke3d-gcc4/source/buildengine/a.c
  	    *dest = ((unsigned char*)i2)[i4];
  	    return i1;
 diff -ur duke3d/source/buildengine/pragmas.c duke3d-gcc4/source/buildengine/pragmas.c
---- duke3d/source/buildengine/pragmas.c	2003-07-25 20:11:32.000000000 -0400
-+++ duke3d-gcc4/source/buildengine/pragmas.c	2005-06-18 18:25:37.000000000 -0400
+--- source/buildengine/pragmas.c	2003-07-25 20:11:32.000000000 -0400
++++ source/buildengine/pragmas.c	2005-06-18 18:25:37.000000000 -0400
 @@ -56,28 +56,39 @@
  
  void clearbufbyte(void *buffer, int size, long fill_value) {
@@ -74,8 +74,8 @@ diff -ur duke3d/source/buildengine/pragmas.c duke3d-gcc4/source/buildengine/prag
  	}
 
 diff -u -r duke3d/source/buildengine/a.h duke3d.gcc4.1.1/source/buildengine/a.h
---- duke3d/source/buildengine/a.h	2003-04-11 08:54:06.000000000 +0200
-+++ duke3d.gcc4.1.1/source/buildengine/a.h	2006-06-22 12:14:40.366393568 +0200
+--- source/buildengine/a.h	2003-04-11 08:54:06.000000000 +0200
++++ source/buildengine/a.h	2006-06-22 12:14:40.366393568 +0200
 @@ -116,56 +116,56 @@
  
    #if ((defined __GNUC__) && (!defined C_IDENTIFIERS_UNDERSCORED))
diff --git a/games-fps/etqw-data/Manifest b/games-fps/etqw-data/Manifest
index 2a1737e58d60..7c6214fe2f0c 100644
--- a/games-fps/etqw-data/Manifest
+++ b/games-fps/etqw-data/Manifest
@@ -1,2 +1,2 @@
-EBUILD etqw-data-1.0.ebuild 1293 BLAKE2B 2a3b9cda086151566117fef24f241d76e2735f0f9fe5584266feadf0c3d5fecbbe42a0690bb6ef196282529f7d7668086576418a55b2e11e1dfcff6c2c2b0a58 SHA512 03b52c62f3b7944027e40e665ece3d9e0703cc7091443e80ce37759df8077a4d24a4da9d25d6386eb6319f237356a008334fc7d5edcd9e8a4ab4aaa682e0ecc3
+EBUILD etqw-data-1.0.ebuild 1301 BLAKE2B d8d4e6fb5ccb3df9e3f336c16a87cceba197236e8bc91b3fdfffc4c184a553cb2b95be9801af42b6d0248816279efaf3aba51f2efce0d1d392c9ba6a690848ff SHA512 f17c60fc3705f86d052082d1806e7a3f1e9450469bbbe4c4b4d72e7f4fb357361cfa46cd596be6cca54bcc4e618b4aa09e35c9509f981b65d11362ca00687147
 MISC metadata.xml 252 BLAKE2B 1b951d2e730631865ae5f379b19ed9de2c8adf2f2786da3f75d0871d967374198ddd9106433f388bdc7050c37063fb28cda4320ae7bdc9a03854838693d9f952 SHA512 90798aff93ec7e3881b882e7b10bb1680e8cb7d82b0ef4280e562ab0c9e8a2daba8afe57333dc64697322267a4b651c00ee9b4fdeb56278ff70c073da7b91638
diff --git a/games-fps/etqw-data/etqw-data-1.0.ebuild b/games-fps/etqw-data/etqw-data-1.0.ebuild
index 37737ed0d091..048efa9cd245 100644
--- a/games-fps/etqw-data/etqw-data-1.0.ebuild
+++ b/games-fps/etqw-data/etqw-data-1.0.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit eutils cdrom games
 
 DESCRIPTION="Enemy Territory: Quake Wars data files"
diff --git a/games-fps/freedoom/Manifest b/games-fps/freedoom/Manifest
index 26f57b4840f8..78ede7d22c24 100644
--- a/games-fps/freedoom/Manifest
+++ b/games-fps/freedoom/Manifest
@@ -1,4 +1,4 @@
 DIST freedm-0.10.1.zip 7230096 BLAKE2B 2b553e6f263acbd6c63ddb123d1bf9fe80ce1d7a3a6b7e1b7ec64446acb520c147336da5431c5c93f0843ecfa039645cc21a4a62b39268b34f99306e1eae4f14 SHA512 cc3b393e20b503e83ca2bf90ac528d42c951881b58d22970b154fd262e69f7bae038f7300d74e467af6e31e626a12d4a9fb5bf5ff3e9da84506df41be18577f2
 DIST freedoom-0.10.1.zip 18496121 BLAKE2B b9fe88e086fb35b29d9562c5ac1335bd7eeb18ea7900c44d4ca7707bc52f03b73ec1190c578f57548320c70c0f73415a268d737cc545310fecb66ba47d242107 SHA512 a98d400267801dfdf67aa035def6d62fffff1c3a2d1aebd482929274e1f86e05e79c9cbe528a80d5c87df7306364ca74a3b03674273a0079bad724e7b23e38eb
-EBUILD freedoom-0.10.1.ebuild 1104 BLAKE2B a78e8d5bf0cbe54196feea5bc36fa32401ed6b8840cf43ef7270bdd224f4642cafe8e6aec4f667f2a3a892311d772b505ba6be6e8e3e3db5eed30417e3f2b557 SHA512 c7e6fb5e7b1fc77d0404093945f34467befd45295c9a4948c60ae7497c1d326276574e904673338ce160bc475c903307d6dfc205eaa8eb4b78aa8d72a062d362
+EBUILD freedoom-0.10.1-r1.ebuild 1107 BLAKE2B 20f9de2e03a87686acd9fd69bd3400332f7bcdce6dfbb31e498dbdb52503b6fc626c26c77f261338f1685cabc5b9c0bf34582c8fc212f756e139f711c1e0120a SHA512 c4d2d314dd2c298e86de7e9616fa77901d321075404269a0e1b48a44f019a0f0559661c16c3e19b53cb2783c2a3a9e240bdce5d387647784740c8324fba7dd68
 MISC metadata.xml 345 BLAKE2B 856529c69e0cede9d5ddfc4476945783de0ba760f0c1719d1f58a012da24a6739757af14561a04e9393c49cdd7e2cf69fb3a2a690140adbe3e0635953175c46b SHA512 d830ba46200839ec37d298883c566cc63eafbc45ad6683ef028d4168e0bd4aa245fb13d4c5e84eb5113ee37db85d018f8ef7222da00682524157ff5d29a6da6b
diff --git a/games-fps/freedoom/freedoom-0.10.1-r1.ebuild b/games-fps/freedoom/freedoom-0.10.1-r1.ebuild
new file mode 100644
index 000000000000..357def0066df
--- /dev/null
+++ b/games-fps/freedoom/freedoom-0.10.1-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit readme.gentoo-r1
+
+DESCRIPTION="Freedoom - Open Source Doom resources"
+HOMEPAGE="http://www.nongnu.org/freedoom/"
+SRC_URI="https://github.com/freedoom/freedoom/releases/download/v${PV}/freedoom-${PV}.zip
+	https://github.com/freedoom/freedoom/releases/download/v${PV}/freedm-${PV}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+S="${WORKDIR}"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+A Doom engine is required to play the wad
+but games-fps/doomsday doesn't count since it doesn't
+have the necessary features.
+To play freedoom with Doom engines which do not support
+subdirectories, create symlinks by running the following:
+(Be careful of overwriting existing wads.)
+
+# cd /usr/share/doom-data
+# ln -sn freedoom/*.wad .
+"
+
+src_install() {
+	insinto /usr/share/doom-data/${PN}
+	doins */*.wad
+	dodoc "${P}"/CREDITS
+	HTMLDOCS="${P}/README.html" einstalldocs
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/games-fps/freedoom/freedoom-0.10.1.ebuild b/games-fps/freedoom/freedoom-0.10.1.ebuild
deleted file mode 100644
index 4fdffa8813eb..000000000000
--- a/games-fps/freedoom/freedoom-0.10.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit games
-
-DESCRIPTION="Freedoom - Open Source Doom resources"
-HOMEPAGE="http://www.nongnu.org/freedoom/"
-SRC_URI="https://github.com/freedoom/freedoom/releases/download/v${PV}/freedoom-${PV}.zip
-	https://github.com/freedoom/freedoom/releases/download/v${PV}/freedm-${PV}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}
-
-src_install() {
-	insinto "${GAMES_DATADIR}"/doom-data/${PN}
-	doins */*.wad
-	dodoc ${P}/CREDITS
-	dohtml ${P}/README.html
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	elog "A Doom engine is required to play the wad"
-	elog "but games-fps/doomsday doesn't count since it doesn't"
-	elog "have the necessary features."
-	echo
-	ewarn "To play freedoom with Doom engines which do not support"
-	ewarn "subdirectories, create symlinks by running the following:"
-	ewarn "(Be careful of overwriting existing wads.)"
-	ewarn
-	ewarn "   cd ${GAMES_DATADIR}/doom-data"
-	ewarn "   ln -sn freedoom/*.wad ."
-	ewarn
-}
diff --git a/games-fps/openarena/Manifest b/games-fps/openarena/Manifest
index f3204a2a0964..523e9d5cc047 100644
--- a/games-fps/openarena/Manifest
+++ b/games-fps/openarena/Manifest
@@ -2,5 +2,5 @@ AUX openarena-0.8.8-makefile.patch 763 BLAKE2B 0e671cf5be41b48670954fa133d11806b
 AUX openarena-0.8.8-unbundling.patch 3054 BLAKE2B f1f90e3d61d77ec2d36fcc9ce55a53d456084b9862687b49037fceefca7758784e886bf66a689fba7a202a3ead60823311c9f31da804509dc3b60e4b12869964 SHA512 85a7300e78f741d0bcb4c949e17ffac13790bbdf0942fc739fa357ac5cec7a27c67393bb42342981a78fbb12141e3a9e1ffead352db6073bdf63b4135f4dbb43
 DIST openarena-0.8.8.zip 425189255 BLAKE2B f8a8d20cee344a615907e85b8487b8211246888b63d001b5f0fe1b676a699d9268cdf15d7c749837e5789ef254e959f289d9026a1ea3924f50b291a4c7224f28 SHA512 9fa4dabe8a3428dc3cbec97f3b4d20c04569c14cdd00b60e6391c6dd61e310f246ff5ec97e7549821b3d6f5f94b140eb5411a2ddd83dafcad66937b7f78ea8dd
 DIST openarena-engine-source-0.8.8.tar.bz2 3777830 BLAKE2B c20e2ad37aeb3467e2ebd90eab599c4e25a2dc834df81286b01bde9c7081b1b954e3524e5c4110bddcbda5593a40e595aa0a1eae8f20b98a06b4410fcb93f4c8 SHA512 d4ba3655fae500cf5b7475c83d39c81b6abc759da15cfb4ea9e1dc0f47ffb11c1bbbc2b6f85d613ab1d729978eda93d4d7677c9a45a33853e363c820d8b81c43
-EBUILD openarena-0.8.8.ebuild 1803 BLAKE2B 83820d6aa6c6965cc9d384559febe17901b218cf39d5eb6f649c7df13f5f0fd7f5007156ea176e997b38a4a027c8741d91c553f9548fa96fcb20ac7b3c6e0486 SHA512 bd45e7eb583a40fd32bf98b56bb5fded460daa14d90e59ab3ead83b019ea3f3295c915dbfef8bbb57b2f9c3570402e766f1b90b3bd20571e1ab4885265019f74
+EBUILD openarena-0.8.8-r1.ebuild 1790 BLAKE2B 84b530c8efd5617b062b4194e885ad41dcb23cace4a48d5d5c6460e32839ccc99ccd1695c1322916418be6cfad4956c74d1c2eac86a9a93eb4b77b737622260c SHA512 fa0c3302527b579bde188c1c44d928026181d5ccf1e88a871583d1ad0394a56e5d6dc2cdd907e603e52b155e1ee76bc9a99cd43397fa6ed8081487890975d987
 MISC metadata.xml 329 BLAKE2B e35a14a26bbcd2aa34d851acbc510d5e4ba3fa9ee9dc9ecc1c75995c6b8d3f0aea569f55c402295f1835e71d2d8609c226ccd20f9c4f5819c071c54e7d19e08b SHA512 40e88c8cec824e6c3d815516c018292ec64e5b968ede35a4c3c235331cfb32370ceffa954f01ceedffbf64e182f4e6c753a5fe45ce2ed627b6383dfc6b0d39f7
diff --git a/games-fps/openarena/openarena-0.8.8.ebuild b/games-fps/openarena/openarena-0.8.8-r1.ebuild
index 63ae43948870..7440f19e8ec0 100644
--- a/games-fps/openarena/openarena-0.8.8.ebuild
+++ b/games-fps/openarena/openarena-0.8.8-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils flag-o-matic versionator games
+EAPI=6
+inherit desktop epatch flag-o-matic versionator
 
 DESCRIPTION="Open-source replacement for Quake 3 Arena"
 HOMEPAGE="http://openarena.ws/"
@@ -26,15 +26,18 @@ RDEPEND="
 	x11-libs/libXdmcp
 	curl? ( net-misc/curl )
 	openal? ( media-libs/openal )
-	vorbis? ( media-libs/libvorbis )"
+	vorbis? ( media-libs/libvorbis )
+"
 DEPEND="${RDEPEND}
-	app-arch/unzip"
+	app-arch/unzip
+"
 
-MY_S=${WORKDIR}/${PN}-engine-source-${PV}
-BUILD_DIR=${PN}-build
-DIR=${GAMES_DATADIR}/${PN}
+MY_S="${WORKDIR}/${PN}-engine-source-${PV}"
+BUILD_DIR="${PN}-build"
+DIR="/usr/share/${PN}"
 
 src_prepare() {
+	default
 	cd "${WORKDIR}"
 	epatch "${FILESDIR}"/${P}-makefile.patch \
 		"${FILESDIR}"/${P}-unbundling.patch
@@ -64,8 +67,8 @@ src_compile() {
 
 src_install() {
 	cd "${MY_S}"/"${BUILD_DIR}"
-	newgamesbin openarena-smp.* "${PN}"
-	newgamesbin oa_ded.* "${PN}-ded"
+	newbin openarena-smp.* "${PN}"
+	newbin oa_ded.* "${PN}-ded"
 	cd "${S}"
 
 	insinto "${DIR}"
@@ -74,6 +77,4 @@ src_install() {
 	dodoc CHANGES CREDITS LINUXNOTES README
 	newicon "${MY_S}"/misc/quake3.png ${PN}.png
 	make_desktop_entry ${PN} "OpenArena"
-
-	prepgamesdirs
 }
diff --git a/games-fps/prboom/Manifest b/games-fps/prboom/Manifest
index 84ebdd732a2d..b558a0db3d4b 100644
--- a/games-fps/prboom/Manifest
+++ b/games-fps/prboom/Manifest
@@ -1,7 +1,7 @@
-AUX prboom-2.5.0-libpng14.patch 543 BLAKE2B 68d63afc4af8283fdd65e4adb651b7f26a36df72bb252c76e5dd9c47df6a852fd276bdffcf726751514e28104c57684700a6c0ff66238f332dbe5ba6a6c77122 SHA512 84d7b6cb8f8887443b74904a906eb37d08c3a90a96be2c115edaea280a72aeec851964f475fc2a1689a286ee5de481f150a71f952452b590562b912b8f782dce
+AUX prboom-2.5.0-libpng14.patch 547 BLAKE2B b159e7e2654aad0c9d37109c5d6919ca4cc5d29401f839c45690a73ce6b8391aa5ab4f4f1495d48635f87eca0c25b671ef60753ad636f8ee8be0bebd3db56c0b SHA512 0ecebc1f9b8db2662ba643ee36422f11152870e95305cd0e7fda351b4397df002ba8a770664be451fc86c46afd85bd7122aa3a1ed75901d48197accdf35464cf
 AUX prboom-2.5.0-nvidia-test.c 90 BLAKE2B 60afd518380bb119087a3ddde1ce1af2490a650184677e7720dd40be601c227ccf450d68bf1f8afaa54c62ff4272d4a7351b36d7eb1f000b19b48c68ef6f6a6e SHA512 2b864be0a40c213c4dfbef18b25db34ac62968f932f534dbe549019f0000ff7ce524e345740aff8c5b8aecdd2e5df9e42fef298d11f5d2366ad324c3003c4466
-AUX prboom-2.5.0-nvidia.patch 1734 BLAKE2B a019e1e56ef419136f534b73925440ce783d0169eb2a109ab7f433f4dd6bc3c00d06adb7e91f02eebca661d4d846b5971998e9d8100f3708c929b9c6dce975d8 SHA512 d3048ea2f500c6bbfb1e24c75fdc05dbe0f6fbf8d8e71a37aec0f30c6c6ca97a9bc193dee60de3083df15320660908f97bb90fde795cb1d07e3877d27d4a55ea
+AUX prboom-2.5.0-nvidia.patch 1746 BLAKE2B 94acec8ebe5a1ce554c257790ac1721c68e5adf8537acf600b0ea8b3d291f29d80bab1f689c3e1d436a86412f07479a23c231f610f313ae38d8cb101f9d9754b SHA512 f9f99aa310b82e467fda789630a156c6d96b0cf7ff65678365a4b466f5d9a98773daf529f79a35178cd127460199be589a443d9562932332a5a82f7804269592
 DIST prboom-2.5.0.tar.gz 1049505 BLAKE2B eb044c091279e04bfb65f9fea26bb706be213510b82a95ebe9d482a7c5d2c2ca5a51776afb3af6e8cebeba5df2441922f2298e52c54414b56e98e637c6feb544 SHA512 9e25b55047c66931ea010751fb64484e466395b04dfb738ed9dc515bd8b78e1124a337da33bf7be6e97280016ed1f01c852d8bc12704bdb82074488d7b5d2894
 DIST prboom.png 4254 BLAKE2B cf70f0ee9d41ad41c3f326b30a12df90f76fdb788d252b29bce1925ef253ec272feedc7040a8bf33146f313517afdc038c66324b9c671d90a7db89a5da2569db SHA512 72631d253c6754484ab1c96c953ed37a734197fa851dc88156fd3d4fb8396a77347805233481470b936a504d08e06d994de1eba613e6bf70a89db8fc7ee9b1ac
-EBUILD prboom-2.5.0.ebuild 2028 BLAKE2B 44312a151dcd7d6899ba68d1bc3ed6e59aec751fc91b2bd8ff0c79a8b769f0a57dac311d7b7ec630909de4950b6b2e1df79b70b7f48765207fd79dc84e1635f0 SHA512 9d1155c0a336c4158f1385f9701b4a8bb400e20204f1643d5b87b8c41ced040a45dccec5b639c1e6052245a7f2981a672320cd3d9d4462cb49d7471ff22fa070
+EBUILD prboom-2.5.0-r1.ebuild 2010 BLAKE2B f1b0a15691446d91f2143ee808e1d0b285c5223607416936b50def2c304287d080427627e332482399252d6e8e1910821d947c75c40976aa9fb66ce04a717b15 SHA512 15b2d4337f9d9d9b4ad909a7096bc4b533988e7fe6f27f0852ecbb95f76f4833274d5092eaf48beb7ec24c5599bf5d95f84794f60d83d66a13bacd6961fd21df
 MISC metadata.xml 329 BLAKE2B 6c5388579683b49a47404b9f68b46ac1f1a67596bbb523a80fe247ec6fe48d3a4b59ea15aa7be0201879c5f8f050d1713cc2d8c28f128009ba92c8662f71a28f SHA512 a1c50442cb2fb1e0b536fd7b2402f74f4edf3a8edb0ff45ea6873cf24402fd5c37535006604e98b3c0073f9788763efaff2e51a91cd44b7fc37343549be87e80
diff --git a/games-fps/prboom/files/prboom-2.5.0-libpng14.patch b/games-fps/prboom/files/prboom-2.5.0-libpng14.patch
index d0e3c48299f0..3dea0e7a983b 100644
--- a/games-fps/prboom/files/prboom-2.5.0-libpng14.patch
+++ b/games-fps/prboom/files/prboom-2.5.0-libpng14.patch
@@ -1,7 +1,7 @@
 https://bugs.gentoo.org/show_bug.cgi?id=308739
 
---- src/SDL/i_sshot.c
-+++ src/SDL/i_sshot.c
+--- a/src/SDL/i_sshot.c
++++ b/src/SDL/i_sshot.c
 @@ -231,7 +231,7 @@
    if (fp)
    {
diff --git a/games-fps/prboom/files/prboom-2.5.0-nvidia.patch b/games-fps/prboom/files/prboom-2.5.0-nvidia.patch
index 2b7aa9b32d46..c602c784c13f 100644
--- a/games-fps/prboom/files/prboom-2.5.0-nvidia.patch
+++ b/games-fps/prboom/files/prboom-2.5.0-nvidia.patch
@@ -1,5 +1,5 @@
---- src/gl_intern.h.orig	2003-09-21 16:39:30.247451624 -0400
-+++ src/gl_intern.h	2003-09-21 16:39:41.610724144 -0400
+--- a/src/gl_intern.h.orig	2003-09-21 16:39:30.247451624 -0400
++++ b/src/gl_intern.h	2003-09-21 16:39:41.610724144 -0400
 @@ -84,6 +84,6 @@
  #define min(a,b) ((a)<(b)?(a):(b))
  #endif
@@ -8,8 +8,8 @@
 +//PFNGLCOLORTABLEEXTPROC gld_ColorTableEXT;
  
  #endif // _GL_INTERN_H
---- src/gl_main.c.orig	2003-09-21 16:39:55.436622288 -0400
-+++ src/gl_main.c	2003-09-21 16:43:00.943420968 -0400
+--- a/src/gl_main.c.orig	2003-09-21 16:39:55.436622288 -0400
++++ b/src/gl_main.c	2003-09-21 16:43:00.943420968 -0400
 @@ -285,6 +285,7 @@
  
      if (strcasecmp(extension, "GL_EXT_texture_filter_anisotropic") == 0)
@@ -35,8 +35,8 @@
      W_UnlockLumpName("PLAYPAL");
    } else {
      if (palette>0)
---- src/gl_texture.c.orig	2003-09-21 16:43:18.450759448 -0400
-+++ src/gl_texture.c	2003-09-21 16:43:39.549551944 -0400
+--- a/src/gl_texture.c.orig	2003-09-21 16:43:18.450759448 -0400
++++ b/src/gl_texture.c	2003-09-21 16:43:39.549551944 -0400
 @@ -178,7 +178,7 @@
    pal[transparent_pal_index*4+1]=0;
    pal[transparent_pal_index*4+2]=0;
diff --git a/games-fps/prboom/prboom-2.5.0.ebuild b/games-fps/prboom/prboom-2.5.0-r1.ebuild
index 89b2de060de4..9cb1017bc0a2 100644
--- a/games-fps/prboom/prboom-2.5.0.ebuild
+++ b/games-fps/prboom/prboom-2.5.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs games
+EAPI=6
+inherit desktop readme.gentoo-r1 toolchain-funcs
 
 DESCRIPTION="Port of ID's doom to SDL and OpenGL"
 HOMEPAGE="http://prboom.sourceforge.net/"
@@ -14,21 +14,40 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
-DEPEND="media-libs/libsdl[joystick,video]
+RDEPEND="
+	media-libs/libsdl[joystick,video]
 	media-libs/sdl-mixer
 	media-libs/sdl-net
 	!<games-fps/lsdldoom-1.5
 	virtual/opengl
-	virtual/glu"
-RDEPEND="${DEPEND}"
+	virtual/glu
+"
+DEPEND="${RDEPEND}"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+To play the original Doom levels, place doom.wad and/or doom2.wad
+into /usr/share/doom-data
+Then run ${PN} accordingly.
+
+doom1.wad is the shareware demo wad consisting of 1 episode,
+and doom.wad is the full Doom 1 set of 3 episodes
+(or 4 in the Ultimate Doom wad).
+
+You can even emerge doom-data and/or freedoom to play for free.
+"
 
 src_prepare() {
+	default
+
 	ebegin "Detecting NVidia GL/prboom bug"
 	$(tc-getCC) "${FILESDIR}"/${P}-nvidia-test.c 2> /dev/null
 	local ret=$?
 	eend ${ret} "NVidia GL/prboom bug found ;("
-	[ ${ret} -eq 0 ] || epatch "${FILESDIR}"/${P}-nvidia.patch
-	epatch "${FILESDIR}"/${P}-libpng14.patch
+	[ ${ret} -eq 0 ] || eapply "${FILESDIR}"/${P}-nvidia.patch
+
+	eapply "${FILESDIR}"/${P}-libpng14.patch
+
 	sed -i \
 		-e '/^gamesdir/ s/\/games/\/bin/' \
 		src/Makefile.in \
@@ -48,32 +67,25 @@ src_configure() {
 	# leave --disable-cpu-opt in otherwise the configure script
 	# will append -march=i686 and crap ... let the user's CFLAGS
 	# handle this ...
-	egamesconf \
+	econf \
 		--enable-gl \
 		--disable-i386-asm \
 		--disable-cpu-opt \
-		--with-waddir="${GAMES_DATADIR}/doom-data"
+		--with-waddir="/usr/share/doom-data"
 }
 
 src_install() {
 	default
-	emake DESTDIR="${D}" install
+
 	doman doc/*.{5,6}
+
 	dodoc doc/README.* doc/*.txt
+	readme.gentoo_create_doc
+
 	doicon "${DISTDIR}"/${PN}.png
 	make_desktop_entry ${PN} "PrBoom"
-	prepgamesdirs
 }
 
 pkg_postinst() {
-	games_pkg_postinst
-	elog "To play the original Doom levels, place doom.wad and/or doom2.wad"
-	elog "into ${GAMES_DATADIR}/doom-data"
-	elog "Then run ${PN} accordingly."
-	elog
-	elog "doom1.wad is the shareware demo wad consisting of 1 episode,"
-	elog "and doom.wad is the full Doom 1 set of 3 episodes"
-	elog "(or 4 in the Ultimate Doom wad)."
-	elog
-	elog "You can even emerge doom-data and/or freedoom to play for free."
+	readme.gentoo_print_elog
 }
diff --git a/games-fps/transfusion-bin/Manifest b/games-fps/transfusion-bin/Manifest
index 5f23e6e8ff4c..a2001e9c6689 100644
--- a/games-fps/transfusion-bin/Manifest
+++ b/games-fps/transfusion-bin/Manifest
@@ -2,5 +2,5 @@ AUX transfusion 65 BLAKE2B efad05a6cdbe57c12a95d57deafd67f9c377db323fe12f24dd0a1
 DIST transfusion-1.0-linux.i386.zip 40532193 BLAKE2B 9b12f8d6ed91a1c31935f21a3094e186439159401411f3e1291381832dc09dcbc265113ed6df056109394b2c59ee9b556a7e16ebde6b001acd63a8854a58ebbe SHA512 cd4372e09ac6e3e4f1e2fe99afb18b1c5981c56dac84edd4d440be8914322984a377d4622e2b45719fead86d1b1c7f3ab74580430eba8b69bbe01702c8dbcafb
 DIST transfusion-patch-1.01-linux.i386.zip 8790776 BLAKE2B b8faa46a259a2f13f876540860b01b269a31969516b48901cf1e54c372e7db91f416f86af80b9a131e4bf2cb17cffc93dd04b50c1450f361601b3a048b8d2729 SHA512 b5d6b446be580ab09a79bdb651436de242603a7f215e85ab61ecc45d02739ca285a9a0bfaaf95c08df77f79928a42a27cace76a1695300d80172e2f4e9a488cf
 DIST transfusion.png 2102 BLAKE2B 5d062ee459ab8f309b35d07abdb63c442f30b98bb2cce6e55b23336e9ddf36f099f1d554a5ea0a76a3a1b1484a6559cf085e5e3d8aa27972c04d52bee3b7a701 SHA512 902c630c5f0956678a905760674be7c8bd0a4d72e217ca8cddd56681d0b1161051602bd7bf6e24cc25b6d99cf7c0e5a9802f8230eec7c6a9831aecd700838363
-EBUILD transfusion-bin-1.01.ebuild 1156 BLAKE2B 31c3d7c3a05cf98470a24d57a9cfead653f4615455cada4ccdaa59399343fe6c75a742426110c2780d50b18d4975f50bf47b951a902df3d05362129545dc9529 SHA512 76f6e2da2f9c62e048b966ec2ffb9b4d829595e09a531e6301d04341b9eef076aacf3d9fe975060ab7edd42418cab915f3c44122aa7ad5f98dcbc267a0dd91d7
+EBUILD transfusion-bin-1.01-r1.ebuild 1146 BLAKE2B bb8b06f9c7ef1e01b2df467e1f740117044f563aa705b53d85c5fb452912d7a7cefa7e0b9e5e691c0e32eb22d5a10eb7c27890aa9c3405fed2f3c586500488f2 SHA512 2a71f2d5f854f621f076f8da8abfe9f24b0485017622c4ca8c6258c06c62b58bcef40fbc89d9f483bbc9ed188aa7c01774df49b32baf692a14028baf909ff083
 MISC metadata.xml 328 BLAKE2B be547572a9876be9ff3065dc5203ad70a0907c88ed8eafb48338a582bb28c9d417931b4243d673caee83ec0665963707bc00609fcda74259fe6ba3173f0ec32b SHA512 85e11b06989c540831ee3981820d63507c3a233014e73cb577089d599019de54db3bd52f4304623a5b81ae8dfacd7a6b9f59098865da0aff418cc79a46009f8d
diff --git a/games-fps/transfusion-bin/transfusion-bin-1.01.ebuild b/games-fps/transfusion-bin/transfusion-bin-1.01-r1.ebuild
index 9836fd5cf2a1..a535a8e3f9c6 100644
--- a/games-fps/transfusion-bin/transfusion-bin-1.01.ebuild
+++ b/games-fps/transfusion-bin/transfusion-bin-1.01-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils games
+EAPI=6
+inherit eutils
 
-MY_PN=${PN/-bin/}
+MY_PN="${PN/-bin/}"
 DESCRIPTION="Blood remake"
 HOMEPAGE="http://www.transfusion-game.com/"
 SRC_URI="mirror://sourceforge/blood/${MY_PN}-1.0-linux.i386.zip
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/blood/${MY_PN}-1.0-linux.i386.zip
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 RESTRICT="strip"
 
@@ -21,15 +21,15 @@ RDEPEND="sys-libs/glibc"
 DEPEND="${RDEPEND}
 	app-arch/unzip"
 
-S=${WORKDIR}/${MY_PN}
+S="${WORKDIR}/${MY_PN}"
 
-dir=${GAMES_PREFIX_OPT}/${MY_PN}
-Ddir=${D}/${dir}
+dir="/opt/${MY_PN}"
+Ddir="${D}/${dir}"
 
 src_install() {
 	# install everything that looks anything like docs...
 	dodoc ${MY_PN}/doc/*.txt ${MY_PN}/*txt qw/*txt
-	dohtml ${MY_PN}/doc/*.html
+	HTML_DOCS="${MY_PN}/doc/*.html" einstalldocs
 
 	#...then mass copy everything to the install dir...
 	dodir "${dir}"
@@ -42,8 +42,6 @@ src_install() {
 		"${Ddir}"/${MY_PN}/*txt
 
 	doicon "${DISTDIR}"/${MY_PN}.png
-	games_make_wrapper ${MY_PN} ./${MY_PN}-glx "${dir}" "${dir}"
+	make_wrapper ${MY_PN} ./${MY_PN}-glx "${dir}" "${dir}"
 	make_desktop_entry ${MY_PN} "Transfusion" ${MY_PN}
-
-	prepgamesdirs
 }
diff --git a/games-fps/worldofpadman/Manifest b/games-fps/worldofpadman/Manifest
index d484dc96d51b..4989bfd91abd 100644
--- a/games-fps/worldofpadman/Manifest
+++ b/games-fps/worldofpadman/Manifest
@@ -1,5 +1,5 @@
-AUX worldofpadman-1.6-gentoo.patch 2102 BLAKE2B f3a3ba875d272ecc4aa774bf6d77def996db05614726b85b599332c9208770b4b64dc85bffcda60f39bfcce53c972e43e11d3b2844a37c0d6df54174819eac0e SHA512 d124b17972f0837c0ded524c0077bf2c58cf5d6d6254c69069d07e3616096ed7bf9e67ea9e6e658c1e706df28403375693858131eb09e30877d1132bec48efd7
+AUX worldofpadman-1.6-gentoo.patch 2106 BLAKE2B ae27668e8e3e570b5a5beff3fbaefc4fb44c41d3d0686c90437256df66f994eeb66337ec4444d6190cd5398d8f044067fce6234b952082d2ea44a8195c3ceedb SHA512 9c5a3e85a2e67cfca2e066b9f92103020e005988a000029439f0678249041bc3675718beca0addf1bb360180af72d7e1acfa1136e289784d39abaea44096db2d
 DIST wop-1.5-unified.zip 947290087 BLAKE2B 5fb87cde661882fc095376012d9aca134d6399b4cedd4f3c78b739dd19e126360070278045d74c3318306e17490338111b8621e1c543b46e6bbecfbcd3658675 SHA512 fea0207efadf15afab7001227e27126aef4a673bd478dccb513c3011d0811074b2788083862f07e2f02f1a80ccb57a45ff64de8de155d8f8f7f1ab53ecf2402b
 DIST wop-1.5.x-to-1.6-patch-unified.zip 122204892 BLAKE2B a0f9feb04a15ec04dd64dbacdf5a158738d625651b2293bc8b3740067e849f33cdd144bce6afd11914524d89fe4bcfd48dbcbc455e51017b1216439e9bae484a SHA512 a45018bd79e9e23c57bcaf692fa14c323671103558caad6acb794c2990cc5fe9cc8bdbe6a6c8254c4560d81eb59f5e3b9a6800a61b21a15870c4439f7179d936
-EBUILD worldofpadman-1.6.ebuild 2078 BLAKE2B 7bdd18f3213490b5116b2222c0bc3dcaf715b643e82971e20345b7950f17f8fbb2fdea32a5f681bf5f58226be54e82fbb30e85dd8153e1e48cac0c234f700ba0 SHA512 5f8c4310b51f53e73e3d339f4fdb45c25412b954cb23b8c889dae91bd6124b31f2fbc64e3e1eca01689a88b61723b2f600840b405780ce8100314a598120c8ca
+EBUILD worldofpadman-1.6-r1.ebuild 2073 BLAKE2B 43cf1a387db7a467830775238b64e5c0091c60fd41e620a09d8beb00458015895f74786c542736c067905bd809086e52bb7a37540f79384d26eab72af6773886 SHA512 b4a33420db0e940ab1cef896a02a353554b45b4efcf4612bd9087714bb0fa1b0dc2add1ec3dd4608f6f9b6bc78fb9f8e537a6cc583aa91fc91a3540e62a92737
 MISC metadata.xml 421 BLAKE2B 0c13dc1221c5aa3f8ba78de2614ec62e48177ab0433652ec97ce454883b4a12ffe767ef6786f7f0ea5a75a2a67e868a01e771d7eb575c7ab8eeb4689ad5a8cdf SHA512 2716235255bd6e00d84c6f11f784850959fd50a6542fd98d9c7815d0c7a6f5a201807b02f1cd7d1ace59f1f19f40cb97aa01b9d649bb198678ac60f84d81eb1e
diff --git a/games-fps/worldofpadman/files/worldofpadman-1.6-gentoo.patch b/games-fps/worldofpadman/files/worldofpadman-1.6-gentoo.patch
index 04804563646d..d55e43ffcf52 100644
--- a/games-fps/worldofpadman/files/worldofpadman-1.6-gentoo.patch
+++ b/games-fps/worldofpadman/files/worldofpadman-1.6-gentoo.patch
@@ -1,5 +1,5 @@
---- Makefile.old	2012-04-26 21:40:25.277417417 +0200
-+++ Makefile	2012-04-26 21:43:34.300835150 +0200
+--- a/Makefile.old	2012-04-26 21:40:25.277417417 +0200
++++ b/Makefile	2012-04-26 21:43:34.300835150 +0200
 @@ -344,11 +344,11 @@
    endif
    
diff --git a/games-fps/worldofpadman/worldofpadman-1.6.ebuild b/games-fps/worldofpadman/worldofpadman-1.6-r1.ebuild
index 6fce51878abb..eced904caceb 100644
--- a/games-fps/worldofpadman/worldofpadman-1.6.ebuild
+++ b/games-fps/worldofpadman/worldofpadman-1.6-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils games
+EAPI=6
+inherit desktop
 
 DESCRIPTION="A cartoon style multiplayer first-person shooter"
 HOMEPAGE="http://worldofpadman.net/"
@@ -16,12 +16,12 @@ IUSE="+curl dedicated maps +openal +theora +vorbis"
 
 RDEPEND="sys-libs/zlib
 	!dedicated? (
-		media-libs/libsdl[opengl,video,X]
 		>=media-libs/speex-1.2.0
 		media-libs/speexdsp
-		virtual/glu
 		virtual/jpeg:0
+		media-libs/libsdl[opengl,video,X]
 		virtual/opengl
+		virtual/glu
 		openal? ( media-libs/openal )
 		curl? ( net-misc/curl )
 		vorbis? ( media-libs/libvorbis )
@@ -29,11 +29,13 @@ RDEPEND="sys-libs/zlib
 			media-libs/libtheora
 			media-libs/libogg
 		)
-	)"
+	)
+"
 DEPEND="${RDEPEND}
-	app-arch/unzip"
+	app-arch/unzip
+"
 
-S=${WORKDIR}/${P}_svn2178-src
+S="${WORKDIR}/${P}_svn2178-src"
 
 src_unpack() {
 	unpack ${A}
@@ -41,7 +43,8 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
+	default
+	eapply "${FILESDIR}"/${P}-gentoo.patch
 	sed -i \
 		-e 's:JPEG_LIB_VERSION < 80:JPEG_LIB_VERSION < 62:' \
 		code/renderer/tr_image_jpg.c || die #479652
@@ -60,7 +63,7 @@ src_compile() {
 		V=1 \
 		ARCH=${arch} \
 		BUILD_CLIENT=$(use dedicated && echo 0) \
-		DEFAULT_BASEDIR="${GAMES_DATADIR}"/${PN} \
+		DEFAULT_BASEDIR=/usr/share/${PN} \
 		OPTIMIZE= \
 		USE_CURL=$(usex curl 1 0) \
 		USE_CURL_DLOPEN=0 \
@@ -75,13 +78,13 @@ src_compile() {
 }
 
 src_install() {
-	newgamesbin build/release-*/wopded.* ${PN}-ded
+	newbin build/release-*/wopded.* ${PN}-ded
 	if ! use dedicated ; then
-		newgamesbin build/release-*/wop.* ${PN}
+		newbin build/release-*/wop.* ${PN}
 		newicon misc/quake3.png ${PN}.png
 		make_desktop_entry ${PN} "World of Padman"
 	fi
-	insinto "${GAMES_DATADIR}"/${PN}
+	insinto /usr/share/${PN}
 	doins -r ../wop
 
 	dodoc id-readme.txt \
@@ -89,6 +92,5 @@ src_install() {
 		voip-readme.txt \
 		../XTRAS/changelog.txt \
 		../XTRAS/sounds_readme.txt
-	dohtml -r ../XTRAS/readme{,.html}
-	prepgamesdirs
+	HTML_DOCS="../XTRAS/readme ../XTRAS/readme.html" einstalldocs
 }