gentoo resync : 30.04.2018

24 files changed, 147 insertions, 479 deletions

diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 36d0fabe77f2..67e595dfb09a 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
diff --git a/games-fps/alephone-infinity/Manifest b/games-fps/alephone-infinity/Manifest
deleted file mode 100644
index 81fe6ac1e145..000000000000
--- a/games-fps/alephone-infinity/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST MarathonInfinity.zip 30109883 BLAKE2B 5412c172e3f3066250912d9e818b172c9b036c4a71d090d36c3ef7e078d7e37ca7d676282176bd79d3e87b212d40245e7d16d0f8016a3094de24c4434570fdbd SHA512 1f347615b96d2c07914cda78bdc6971311f3933af78debfcd9fa87a0a3048220726a082602b7a76f516f7b3dd3240d1ea843794ab34e4e9e7733342d9d9fe5b1
-DIST alephone-infinity.png 19193 BLAKE2B c4e6eeb74d56798ebf3f96f2ee509fb6ac7d695e2c51e4f34599be507deb6354a0e034e0441ced4b5ad5688ec87a2129fdbded28b036e074737cc8dd0974683b SHA512 ad5c683aae4ee0afa306aaf33c9ad93a2eee59a4283166aada58a48a8dbbe8de62c8af0b04b143366448ef101ba8b2530cbc8bc5b3e1de62c5177775fae6bfd3
-EBUILD alephone-infinity-20080622.ebuild 941 BLAKE2B 5c725d2ce6728b0f6d446fadfbeee2db3649bdba2bec26dd26f952ef69c306822ca6568c6d9df9edc8fea843d4a52df105eeb5e3dd6839626ce1cbff5c9ffc2c SHA512 6aab1ea5d96340a521cc2b9278f0d22c3da868c9d0731ae80064f1d6c36ff0064f45321f90de48451168ed32475e3f40847fec86b685255a082e6e4ea43ff0ff
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/alephone-infinity/alephone-infinity-20080622.ebuild b/games-fps/alephone-infinity/alephone-infinity-20080622.ebuild
deleted file mode 100644
index 46cd7a3b526d..000000000000
--- a/games-fps/alephone-infinity/alephone-infinity-20080622.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="Aleph One - Marathon Infinity"
-HOMEPAGE="http://trilogyrelease.bungie.org/"
-SRC_URI="http://files3.bungie.org/trilogy/MarathonInfinity.zip
-	mirror://gentoo/${PN}.png"
-
-LICENSE="bungie-marathon"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-RESTRICT="mirror"
-
-RDEPEND="games-fps/alephone"
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}/Marathon\ Infinity
-
-src_install() {
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r *
-
-	doicon "${DISTDIR}"/${PN}.png
-	make_desktop_entry "alephone.sh infinity" "Aleph One - Marathon Infinity"
-
-	# Make sure the extra dirs exist in case the user wants to add some data
-	keepdir "${GAMES_DATADIR}"/${PN}/{Scripts,"Physics Models",Textures,Themes}
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	elog "To play this scenario, run:"
-	elog "alephone.sh infinity"
-}
diff --git a/games-fps/alephone-infinity/metadata.xml b/games-fps/alephone-infinity/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/alephone-infinity/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/alephone/Manifest b/games-fps/alephone/Manifest
deleted file mode 100644
index 31f1a249b724..000000000000
--- a/games-fps/alephone/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX alephone.sh 442 BLAKE2B 9f11de53784eff32b1614cf2e593774738cba7b7fed2ea313ff9b1f8a376dd2c38969f5e9ffffa403128479961dd8eadad89dcd732b232897700e4ca61eb9d52 SHA512 e6bda9a286cfbc2971af2ac4fc3a119e680ca8fe987ab4a1599a23de766b09702fe2a2c7713598918884a998636f58fd15da083c4b5130e1ae85e09720b2d0f1
-DIST AlephOne-20150620.tar.bz2 5031898 BLAKE2B 7f319c1b1ae2930e5ebfdf7baa1947d35e3f606e936fe86393cf26e1b9b7803283897811bf17cdb2f88931db606b3a13ed1f83bf9a8e9fed3b197135da0cbf46 SHA512 fb47969137b791f83b111171d7b92b3708597db294ce19fb682ce28c49edcd4cb84a6ce4dcceb6630812a8c676dfe7f39f3fb4642f40ef7086a0d6c6fdeba8df
-EBUILD alephone-20150620-r1.ebuild 2126 BLAKE2B e21b665a3c2dd27c2169067ee9e8c9f5889e2369e6346b7bee9ec7599a816d42f2042928736fe4b473951b5168774712111c51e1332afe492e0dbb38447d5b97 SHA512 0836de5d9303996e619669e23b819ca4698796e1730d0697efc642784b3f70894f94dc9049945391ae0852d6fe0e44ed3a2835ed9f4ea95da02b5a462e6e60ee
-MISC metadata.xml 398 BLAKE2B 5ca8579e57665f5fe1b55380411d54de962f7735ace8a4b4116b1d246e73acb858596343cdeaded8d78d27271ea2746b1e93cdb90a949452ed9c296cd02f924f SHA512 2c4d493556b9b5407016ff655d093dc22fc1462a6d92c21c6e37bd4ba6566b64cbf848668fa1db1442f8f712dca592c38779641e3c522b23c44056405061fbe9
diff --git a/games-fps/alephone/alephone-20150620-r1.ebuild b/games-fps/alephone/alephone-20150620-r1.ebuild
deleted file mode 100644
index 4672cf9d6742..000000000000
--- a/games-fps/alephone/alephone-20150620-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils
-
-MY_P=AlephOne-${PV}
-DESCRIPTION="An enhanced version of the game engine from the classic Mac game, Marathon"
-HOMEPAGE="http://source.bungie.org/"
-SRC_URI="https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${PV}/AlephOne-${PV}.tar.bz2"
-
-LICENSE="GPL-3+ BitstreamVera OFL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="alsa curl ffmpeg mad mpeg sndfile speex vorbis"
-
-RDEPEND="
-	dev-libs/boost
-	dev-libs/expat
-	dev-libs/zziplib
-	media-libs/libpng:0
-	media-libs/libsdl[joystick,opengl,video]
-	media-libs/sdl-image[png]
-	media-libs/sdl-net
-	media-libs/sdl-ttf
-	virtual/opengl
-	virtual/glu
-	alsa? ( media-libs/alsa-lib )
-	curl? ( net-misc/curl )
-	ffmpeg? ( virtual/ffmpeg )
-	mad? ( media-libs/libmad )
-	mpeg? ( media-libs/smpeg )
-	sndfile? ( media-libs/libsndfile )
-	speex? ( media-libs/speex )
-	vorbis? ( media-libs/libvorbis )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	default
-
-	sed "s:GAMES_DATADIR:/usr/share:g" \
-		"${FILESDIR}"/${PN}.sh > "${T}"/${PN}.sh \
-		|| die
-
-	# try using the system expat - bug #251108
-	sed -i \
-		-e '/SUBDIRS/ s/Expat//' \
-		-e 's/Expat\/libexpat.a/-lexpat/' \
-		Source_Files/Makefile.am || die
-	sed -i -e '/Expat/d' configure.ac || die
-	rm -r Source_Files/Expat || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-lua \
-		--enable-opengl \
-		$(use_with alsa) \
-		$(use_with ffmpeg) \
-		$(use_with mad) \
-		$(use_with mpeg smpeg) \
-		$(use_with sndfile) \
-		$(use_with speex) \
-		$(use_with vorbis)
-}
-
-src_install() {
-	default
-	dobin "${T}"/${PN}.sh
-	doman docs/${PN}.6
-	dodoc docs/*.html
-}
-
-pkg_postinst() {
-	echo
-	elog "Read the docs and install the data files accordingly to play."
-	echo
-	elog "If you only want to install one scenario, read"
-	elog "http://traxus.bungie.org/index.php/Aleph_One_install_guide#Single_scenario_3"
-	elog "If you want to install multiple scenarios, read"
-	elog "http://traxus.bungie.org/index.php/Aleph_One_install_guide#Multiple_scenarios_3"
-	echo
-}
diff --git a/games-fps/alephone/files/alephone.sh b/games-fps/alephone/files/alephone.sh
deleted file mode 100644
index 62ac98f85770..000000000000
--- a/games-fps/alephone/files/alephone.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-DIR=$(dirname "${0}")
-CMD=$(basename "${0}")
-ALEPHONE=${CMD%%.sh}
-
-if [[ -z "${1}" ]]
-then
-	echo "Usage: ${0} SCENARIO FLAGS"
-	echo "Where SCENARIO is one of:"
-	for d in "GAMES_DATADIR"/alephone-*
-	do
-		echo "  ${d##*/alephone-}"
-	done
-	exit 2
-fi
-
-export ALEPHONE_DATA="GAMES_DATADIR/alephone-${1}"
-
-shift
-
-# kill ARTS, because we're just that nice
-if artsshell terminate 2> /dev/null
-then
-	sleep 2
-fi
-
-"${DIR}"/"${ALEPHONE}" "$@"
diff --git a/games-fps/alephone/metadata.xml b/games-fps/alephone/metadata.xml
deleted file mode 100644
index f7a55faa0217..000000000000
--- a/games-fps/alephone/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">marathon</remote-id>
-		<remote-id type="github">Aleph-One-Marathon/alephone</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-fps/alienarena/Manifest b/games-fps/alienarena/Manifest
index 4fb4cd4f8df4..79170bfb87fe 100644
--- a/games-fps/alienarena/Manifest
+++ b/games-fps/alienarena/Manifest
@@ -1,4 +1,4 @@
-AUX alienarena-20130827-format.patch 396 BLAKE2B 5caa63c249845aa8e4dcfc5472857892afd86c790cf57fd2dfd8bd952cb5801fc212012e5683546c3390599245b0d41f39e64c742e4499fc69933f2c687287a7 SHA512 3ce9e89be705d52efcefc5af79c0d61bc2d19b5ed2f4074494560ead4293749e14bb74e9575f328e133c7db4e038630bf607f17edc9243d34a4cfab74bdd1873
+AUX alienarena-20130827-format.patch 400 BLAKE2B b98e23612337d8adcb2a0337ea2d7b0b6bcc5f2cafcd4c11996d94198c0bf4904e6ab5dcd33f690e6bfe3aee22a1d4cc85df522be139ee5bfe4c117ec2cbdfa8 SHA512 f64c502e306a7508258c62882711cc2a8b3261ebea2dd12a43624bb21d5c74f361ae82db3c629a3e903eab166c25013473fc4f0739bddc476e6740a06b69e2a6
 DIST alienarena-7.66-linux20130827.tar.gz 617636649 BLAKE2B 9f15772f12329dc48496d3f998f2913e801b3d2523be63c1b87b72ca278d70cbb32b676652b5287cc7adc5aeb98f7afdf4160a1f9125c1c92b63bf502809e08d SHA512 6b86387b12fc82c01cf7945df5da7beb1a60e42a492b70096c64ace254d6300107a4b40762d20969eefbfe11c7365fbb3a5603b71f288e2330410feef48141a3
-EBUILD alienarena-20130827.ebuild 1579 BLAKE2B 95119236d5b030f283648ee329d33ec6bb901c05e7ef9fb84968d9483aa8208b936a4137169f46152e2cc2159a80d324b276b0bb0d5253926d91820e99de1a7c SHA512 67b39eb6ca8119f321084e16b5b231cb74ad70556976674beaab85fa38c18dccb9ce28a8af39dcbbe50573388c3ce1c7dc14a7cd2204279cc95265b10c798e54
+EBUILD alienarena-20130827-r1.ebuild 1506 BLAKE2B 1f2193ba2993fe39aa5405dad8437117e13b62f33b36f0d10b824fc2f837760cee481e05fffdbdba747ce2f68005f7fdad05abdd1df68a658adeb7573cb2aafb SHA512 931d3d41d0fc0c332dce0448bd02709b293ee4bec1797b1833e5be7655c252a0743b4abbdc308cfcbf5fb8fa8eb2bd3b136c3bb8d996283cdaba72656b490f92
 MISC metadata.xml 377 BLAKE2B 7eb47fff4c65e732aeba6aa299d74e2e8bbb70b2ae0236c2ea9fe821829e5fc4d1a2d2658de762fd238ed9884e65fe822f1b8f9cf7b3bf92a69cf9e4680ca0f9 SHA512 50fc923e0986e11991d55b60137facbf8234dd9d180336664030a1c3d7dfa60665326e1937170b1803577cc55774a806824e2611fb3a1552d31426da5f662b4d
diff --git a/games-fps/alienarena/alienarena-20130827.ebuild b/games-fps/alienarena/alienarena-20130827-r1.ebuild
index 8072a2ce4f47..fabaaecffeb7 100644
--- a/games-fps/alienarena/alienarena-20130827.ebuild
+++ b/games-fps/alienarena/alienarena-20130827-r1.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils gnome2-utils eutils games
+EAPI=6
+inherit desktop gnome2-utils
+
+MY_PN="alienarena-7.66"
 
-MY_PN=alienarena-7.66
 DESCRIPTION="Fast-paced multiplayer deathmatch game"
 HOMEPAGE="http://red.planetarena.org/"
 SRC_URI="http://icculus.org/alienarena/Files/${MY_PN}-linux${PV}.tar.gz
@@ -15,7 +16,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="dedicated +dga +vidmode +zlib"
 
-UIRDEPEND="virtual/jpeg:0
+UIRDEPEND="
+	virtual/jpeg:0
 	media-libs/openal
 	media-libs/libvorbis
 	media-libs/freetype:2
@@ -24,22 +26,24 @@ UIRDEPEND="virtual/jpeg:0
 	dga? ( x11-libs/libXxf86dga )
 	vidmode? ( x11-libs/libXxf86vm )
 	zlib? ( sys-libs/zlib )
-	net-misc/curl"
-UIDEPEND="dga? ( x11-proto/xf86dgaproto )
-	vidmode? ( x11-proto/xf86vidmodeproto )"
+	net-misc/curl
+"
+UIDEPEND="
+	dga? ( x11-proto/xf86dgaproto )
+	vidmode? ( x11-proto/xf86vidmodeproto )
+"
 RDEPEND="!dedicated? ( ${UIRDEPEND} )"
 DEPEND="${RDEPEND}
 	!dedicated? ( ${UIDEPEND} )
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
-S=${WORKDIR}/${MY_PN/_/.}
+S="${WORKDIR}/${MY_PN/_/.}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-format.patch
-}
+PATCHES=( "${FILESDIR}"/${P}-format.patch )
 
 src_configure() {
-	egamesconf \
+	econf \
 		--with-icondir=/usr/share/icons/hicolor/48x48/apps/ \
 		--without-system-libode \
 		--disable-documents \
@@ -54,16 +58,13 @@ src_install() {
 	if ! use dedicated ; then
 		make_desktop_entry ${PN} "Alien Arena"
 	fi
-	prepgamesdirs
 }
 
 pkg_preinst() {
-	games_pkg_preinst
 	gnome2_icon_savelist
 }
 
 pkg_postinst() {
-	games_pkg_postinst
 	gnome2_icon_cache_update
 }
 
diff --git a/games-fps/alienarena/files/alienarena-20130827-format.patch b/games-fps/alienarena/files/alienarena-20130827-format.patch
index 4a88eab840fc..3162a558afad 100644
--- a/games-fps/alienarena/files/alienarena-20130827-format.patch
+++ b/games-fps/alienarena/files/alienarena-20130827-format.patch
@@ -1,5 +1,5 @@
---- source/game/p_client.c.old	2016-01-18 20:13:25.147714704 +0100
-+++ source/game/p_client.c	2016-01-18 20:13:38.776476727 +0100
+--- a/source/game/p_client.c.old	2016-01-18 20:13:25.147714704 +0100
++++ b/source/game/p_client.c	2016-01-18 20:13:38.776476727 +0100
 @@ -2123,7 +2123,7 @@
  #else

  	ent->ctype = 0; //alien is default

diff --git a/games-fps/darkplaces/Manifest b/games-fps/darkplaces/Manifest
index 2f35c62ced01..5124a874f822 100644
--- a/games-fps/darkplaces/Manifest
+++ b/games-fps/darkplaces/Manifest
@@ -1,5 +1,5 @@
 DIST darkplacesengine20140513.zip 28113487 BLAKE2B 9e3ffa759921fd61d1308f7c08cc1253a5a3d32c57e8dd8c2a05771aa0b5019fac7932ad337e4be95545bf093f4a2f20d221328ae0bfa45c2b00a7f5700fc04a SHA512 45864b590057c6de0ea978b3cc967feb879b87b2d376f3b4d8525e037b10ca1fc68599c152506494bb06669c6c2304e0aa0ee1b28f7a0d589d10c23f7285052c
 DIST fuhquake-lits.rar 8388829 BLAKE2B fb9c4db151deb43424de9331641154f412394ae6346864bc62a210c7d8d12c6ed6c8647cb4cd83fa853155c5f562f7e9b8d3c779fe74c1bb3f05bb6f627b1d5e SHA512 6e59f5e08a6c401b329b86b0cd677a04b1a5aee11f24973c77c9e7ea50cab9dedf4fc15c4f3d6b73bdc87bacdc9612a3c244d0a4ceceef943abb6e256ac23925
 DIST id1.pk3 350470 BLAKE2B 76426667de5f42633f608b75286671344d439398aa9b819e9ba3979ca317a93930b1077de7efb4b1bad670a6341c7536d572cfc2590a5812c71dd0c4e8def784 SHA512 d4d7233bc1e5049e89d09448818219b0ce7941fecde5381cd95933e4c96ebc9b4e34ff7eae5eb5d0d1e3cc2ceb4f5254f4d600aded7dda373713149817621331
-EBUILD darkplaces-20140513.ebuild 4443 BLAKE2B 8c97b6b3b45cfe94093f409067cc5559b6b98c8be3c63583713ba9167338c11c339fb6d220bf44d31933181b98e17551947dca07e492665e38993b499aacda5f SHA512 86f0c103972d42ad24f8213cbb73c5237a32f58e06c75bd966822d6ef2aeb1a41d6a9b6c83369b9e340d16041ecd8b8415836c1ced37b2c0ac1620cb1c52e4b2
+EBUILD darkplaces-20140513-r1.ebuild 4419 BLAKE2B 9169f50bd1048a9351158acf76a9baf906b81dfe5ca33e525c4bce678d9204438b354bd17d3bf951a6b566a292f3b6b9b8021cb83d8c639cbc8b3a0984c8c658 SHA512 a767f3c87fc336acabcf660968540528d031514300145f6b33a64215ab5e2e368cba7861c537e1e2c29eb634aed47dda654eeb4346512abbee6c73da00a43e7f
 MISC metadata.xml 567 BLAKE2B 46fb34c2aab597b51dd9e8d5effb76af828734a9a7826c503de0a843d12ddeb275d31d846f419635450a3ce1880eb31a1942e684cdc82d1aad83d1aa1cc97d17 SHA512 719f0053b4390b1dccb63e70bddb518f9aad79c8b240dd37ed16b1680a1053a51e309632893c87c51d6057e2602bc6a3fbe8c7d11330da76d5646b3c8c542bbd
diff --git a/games-fps/darkplaces/darkplaces-20140513.ebuild b/games-fps/darkplaces/darkplaces-20140513-r1.ebuild
index 1e154b7074f7..303d09082be6 100644
--- a/games-fps/darkplaces/darkplaces-20140513.ebuild
+++ b/games-fps/darkplaces/darkplaces-20140513-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit unpacker eutils flag-o-matic games
+EAPI=6
+inherit eutils flag-o-matic unpacker
 
 # Latest versions are in http://icculus.org/twilight/darkplaces/files/
-MY_PV=${PV/_beta/beta}
+MY_PV="${PV/_beta/beta}"
 MY_ENGINE="${PN}engine${MY_PV}.zip"
 
 # Different Quake 1 engines expect the lights in different directories
@@ -24,7 +24,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="alsa cdinstall cdsound debug dedicated demo lights opengl oss sdl textures"
 
-UIRDEPEND="virtual/jpeg:0
+UIRDEPEND="
+	virtual/jpeg:0
 	media-libs/libogg
 	media-libs/libvorbis
 	virtual/opengl
@@ -33,18 +34,23 @@ UIRDEPEND="virtual/jpeg:0
 	x11-libs/libX11
 	x11-libs/libXpm
 	x11-libs/libXxf86dga
-	x11-libs/libXxf86vm"
-UIDEPEND="x11-proto/xextproto
+	x11-libs/libXxf86vm
+"
+UIDEPEND="
+	x11-proto/xextproto
 	x11-proto/xf86dgaproto
 	x11-proto/xf86vidmodeproto
-	x11-proto/xproto"
-RDEPEND="net-misc/curl
+	x11-proto/xproto
+"
+RDEPEND="
+	net-misc/curl
 	cdinstall? ( games-fps/quake1-data )
 	demo? ( games-fps/quake1-demodata )
 	textures? ( >=games-fps/quake1-textures-20050820 )
 	opengl? ( ${UIRDEPEND} )
 	!opengl? ( sdl? ( ${UIRDEPEND} ) )
-	!opengl? ( !sdl? ( !dedicated? ( ${UIRDEPEND} ) ) )"
+	!opengl? ( !sdl? ( !dedicated? ( ${UIRDEPEND} ) ) )
+"
 DEPEND="lights? ( || (
 			app-arch/unrar
 			app-arch/rar ) )
@@ -58,10 +64,11 @@ DEPEND="lights? ( || (
 		${UIRDEPEND}
 		${UIDEPEND} ) ) )
 	virtual/pkgconfig
-	app-arch/unzip"
+	app-arch/unzip
+"
 
-S=${WORKDIR}/${PN}
-dir=${GAMES_DATADIR}/quake1
+S="${WORKDIR}/${PN}"
+dir="/usr/share/quake1"
 
 opengl_client() { use opengl || ( ! use dedicated && ! use sdl ) }
 
@@ -77,6 +84,8 @@ src_unpack() {
 }
 
 src_prepare() {
+	default
+
 	rm "${WORKDIR}"/README-SDL.txt
 	cd "${S}"
 	rm mingw_note.txt
@@ -137,12 +146,12 @@ src_install() {
 		use sdl && type=sdl
 
 		# darkplaces executable is needed, even just for demo
-		newgamesbin "${PN}-${type}" ${PN}
+		newbin "${PN}-${type}" ${PN}
 		newicon darkplaces72x72.png ${PN}.png
 
 		if use demo ; then
 			# Install command-line for demo, even if not desktop entry
-			games_make_wrapper ${PN}-demo "${PN} -game demo"
+			make_wrapper ${PN}-demo "${PN} -game demo"
 		fi
 
 		if use demo && ! use cdinstall ; then
@@ -154,7 +163,7 @@ src_install() {
 	fi
 
 	if use dedicated ; then
-		newgamesbin ${PN}-dedicated ${PN}-ded
+		newbin ${PN}-dedicated ${PN}-ded
 	fi
 
 	dodoc *.txt ChangeLog todo "${WORKDIR}"/*.txt
@@ -170,17 +179,14 @@ src_install() {
 			done
 		fi
 	fi
-	prepgamesdirs
 }
 
 pkg_postinst() {
-	games_pkg_postinst
-
 	if ! use cdinstall && ! use demo ; then
 		elog "Place pak0.pak and pak1.pak in ${dir}/id1"
 	fi
 
-	if use sdl ; then
+	if use sdl && ! use alsa ; then
 		ewarn "Select opengl with alsa, instead of sdl USE flag, for better audio latency."
 	fi
 }
diff --git a/games-fps/doom-data/Manifest b/games-fps/doom-data/Manifest
index 138136bb6e8e..c4056bcb87f6 100644
--- a/games-fps/doom-data/Manifest
+++ b/games-fps/doom-data/Manifest
@@ -1,3 +1,3 @@
 DIST doom1.wad.bz2 1689021 BLAKE2B 45ab359525cec44ac6f58110be80e76a75e0d5e186c1fc6bb67e055e7a7e03d2596c2e99cb3636484245d1af85d6b93830f07d8548df99f5f40e55d249bcef16 SHA512 f3aa78fd1e36d2dbd176c8c5284f8cee4f39d8e34df5386fd668565e752410e2b776413c78c1e7a3571695a1668f1e4820338ebc9a2b1a0ed1a81896260534fe
-EBUILD doom-data-1-r1.ebuild 997 BLAKE2B 4ef324f5ec8f43a5a17aee8ee2b70d560cf5bfa662b03f9a689b66ab2fe204796e655eb022371bccebce5190c22edb683aeea76e4d23684afa5d0505dc5caa5d SHA512 05ddc5e6d798002b397d867eb6ad715535ef69cd752418fff42754af2161c14e6a666c2713132e88504c2ed3558f744b4e91d74babd91d7e4746cca7809bad43
+EBUILD doom-data-1-r2.ebuild 900 BLAKE2B 9a8e2c28cbc9dbc48fb6e986f557fe7629752358822af27a833f7172ef52bde43da146cb855ffc8ebfea4bc920dd4b58ad3088dbaaffa3eabb3ad14910e7639b SHA512 c0b0d7b36df52b3165a07d63297fa14513d6fc1ee01cb0174c8333def136b1ab197dc9ea1c338a58098c003b2c980c6d52397cd316a823a6a89dca2414aafdc4
 MISC metadata.xml 347 BLAKE2B 4655211a8c43a4659d40a685721f45ba4abce6277eba9ec94b19755dff4824feef2bb704d7f5746cb43d91eef2ab9f72a47fe4a116f994cddb8bcc0cf7371180 SHA512 2cf8dbebdc411b37294374d196748fa23a741e5ae37946d87b74fabba84dc67811db3f5e215b82be1ec0e8543ea4e0b5e3a5e46412dffb576b3492ebb79edd3a
diff --git a/games-fps/doom-data/doom-data-1-r1.ebuild b/games-fps/doom-data/doom-data-1-r2.ebuild
index a17ee253c243..dcbff4655ed9 100644
--- a/games-fps/doom-data/doom-data-1-r1.ebuild
+++ b/games-fps/doom-data/doom-data-1-r2.ebuild
@@ -1,10 +1,10 @@
-# 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 games
+EAPI=6
+inherit eutils
 
-DESCRIPTION="collection of doom wad files from id"
+DESCRIPTION="Collection of doom wad files from id"
 HOMEPAGE="http://www.idsoftware.com/"
 SRC_URI="mirror://gentoo/doom1.wad.bz2"
 
@@ -13,26 +13,23 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="doomsday"
 
-DEPEND="doomsday? ( games-fps/doomsday )
-	!<=games-fps/freedoom-0.4.1"
-RDEPEND="${DEPEND}"
+RDEPEND="doomsday? ( games-fps/doomsday )"
+DEPEND=""
 
-S=${WORKDIR}
+S="${WORKDIR}"
 
 src_install() {
-	insinto "${GAMES_DATADIR}"/doom-data
+	insinto /usr/share/doom-data
 	doins *.wad
 	if use doomsday; then
 		# Make wrapper for doomsday
-		games_make_wrapper doomsday-demo "jdoom -file \
-			${GAMES_DATADIR}/doom-data/doom1.wad"
+		make_wrapper doomsday-demo "jdoom -file \
+			/usr/share/doom-data/doom1.wad"
 		make_desktop_entry doomsday-demo "Doomsday - Demo"
 	fi
-	prepgamesdirs
 }
 
 pkg_postinst() {
-	games_pkg_postinst
 	if use doomsday; then
 		elog "To use the doomsday engine, run doomsday-demo"
 	else
diff --git a/games-fps/doomsday/Manifest b/games-fps/doomsday/Manifest
index 06c1a031f2a5..5678892783a9 100644
--- a/games-fps/doomsday/Manifest
+++ b/games-fps/doomsday/Manifest
@@ -1,3 +1,3 @@
-DIST doomsday-stable-1.15.8.tar.gz 52054238 BLAKE2B ab33c197a89c5b3a9aa00628cd88edb5b5d2c1116ed72c55f34bd21e8128b6ff056bbc81900a9ea133b2230319e3c0f7ef79df98609980a59dc1f3da41e2195d SHA512 6d1b86c6e364cbd043b0714eb351113c8bbaf98daddde1bf615fe663c15a763e26d3e478d1adeb6d8a75ed4c89a5a19f3a891e12ea5937ff2fc54b84118f642c
-EBUILD doomsday-1.15.8.ebuild 4864 BLAKE2B 2e9086df482a52cfeb2fdfd552894728df65581992a71f1ae049574fe91a23738c64cd5492932e1a4251c4348bc2eb9f45a27e8b366e86cbfaad6bbc98c10c22 SHA512 56378761047cf905131482931c37b6aa91b3dfe445d7ee5e379f3776003fe297c607cbbd4d2f3085bddcc592871d33c92c04500b4c9c4120d7acdf22dff0ef25
-MISC metadata.xml 1055 BLAKE2B 8a93cd99255f093fee3abd1ab39a1da578caec1a7b70a7d3d23e387e99d7387d5314d4ef4b784d603d989c06a0f407622b3b531b2e96054da850c5145df59972 SHA512 d7dac2852e2f256b2509a73c87f1f3320e8b19f80e859b2d20cb9a9fc24ac16f96ba792ca09773a7dad0aea9b4245bddce27579dfe3c0076371bf4c7d0392f2d
+DIST doomsday-2.0.3.tar.gz 18060670 BLAKE2B e01545f5d719310a78f01de77249a72f9c3c61a1d295ee0827475439b63653f613660bdc033c1651180cc390469c89120d262c15c6e22cece52600e2889e1437 SHA512 4f8e737df9e004cf3ac3cf16b84ffce0c85e2180af552bac41a224595c7f6932397c39f7d3e9fa522e1ae62828cb87f564a5fa411e742eb07bbee96f14c3ee7c
+EBUILD doomsday-2.0.3.ebuild 1752 BLAKE2B b65b8da028703868366192847f12b26e22a3f5b4a4a88a7d17f2b0d9378ecbdb21a3e5f1561c90e8465b4ce7403190d89afdc1da3a5e500b2f681be8dbf9a3b1 SHA512 d954a9b61ee050ec9f30e376aee0e79be62ab6ff254db77dbd1f855c6d79e5ca104e1d47aef3418911f2ba963296d8da5f6ee486e43df1bc50dbbbaf48753b58
+MISC metadata.xml 956 BLAKE2B 762c3c0aa85b8d59cdc333f381e4028c7708d113017c84d7dad4ae2659f7c9c875ec410c04b29baccfb9df267f6a081a2cd5321068a328cfe95d2861d0108c7d SHA512 2efbdb770fec0865b8f6a2b6a1ceab526842f2ff70eb9317048d3595b19ed43ba7a67857d7e698081e28463c9a925630030674992d267e6ec5a37efe67c39cfa
diff --git a/games-fps/doomsday/doomsday-1.15.8.ebuild b/games-fps/doomsday/doomsday-1.15.8.ebuild
deleted file mode 100644
index c2cadea8b251..000000000000
--- a/games-fps/doomsday/doomsday-1.15.8.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: fmod support broken (deng_fmod)
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit python-r1 eutils qmake-utils games
-
-DESCRIPTION="A modern gaming engine for Doom, Heretic, and Hexen"
-HOMEPAGE="http://www.dengine.net/"
-SRC_URI="mirror://sourceforge/deng/Doomsday%20Engine/${PV}/${PN}-stable-${PV}.tar.gz"
-
-LICENSE="GPL-3+ LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated fluidsynth openal snowberry +doom demo freedoom heretic hexen resources tools"
-# we need python at build time, so
-# snowberry? ( ${PYTHON_REQUIRED_USE} )
-# could break the build
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	demo? ( doom ) freedoom? ( doom ) resources? ( doom )"
-
-DEPEND="
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtgui:5[-gles2]
-	dev-qt/qtcore:5
-	net-misc/curl
-	sys-libs/zlib
-	media-libs/assimp
-	!dedicated? (
-		media-libs/libsdl2[joystick,sound]
-		media-libs/sdl2-mixer
-		media-libs/libpng:0
-		virtual/opengl
-		virtual/glu
-		x11-libs/libX11
-		x11-libs/libXrandr
-		x11-libs/libXxf86vm
-	)
-	fluidsynth? ( media-sound/fluidsynth )
-	openal? ( media-libs/openal )
-	tools? ( sys-libs/ncurses:0 )"
-RDEPEND="${DEPEND}
-	!dedicated? (
-		snowberry? (
-			${PYTHON_DEPS}
-			dev-lang/python-exec:2[${PYTHON_USEDEP}]
-			dev-python/wxpython[${PYTHON_USEDEP}]
-		)
-	)"
-DEPEND="${DEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig"
-PDEPEND="
-	!dedicated? (
-		demo? ( games-fps/doom-data )
-		freedoom? ( games-fps/freedoom )
-		resources? ( games-fps/doomsday-resources )
-	)"
-
-S=${WORKDIR}/${PN}-stable-${PV}/${PN}
-
-pkg_setup() {
-	games_pkg_setup
-	python_setup
-}
-
-src_prepare() {
-	sed -i \
-		-e '/readme.path/s#$$PREFIX#/usr#' \
-		client/client.pro server/server.pro || die
-
-	sed -i \
-		-e "/DENG_BASE_DIR =/s:\$\$PREFIX/share:${GAMES_DATADIR}:" \
-		config_unix.pri || die
-
-	{
-		echo "CONFIG += nostrip"
-		echo "PREFIX=${GAMES_PREFIX}"
-
-		if use dedicated ; then
-			echo "CONFIG += deng_noclient"
-			echo "CONFIG += deng_nosnowberry"
-		else
-			echo "CONFIG += deng_$(usex snowberry '' no)snowberry"
-		fi
-
-		use fluidsynth && echo "CONFIG += deng_fluidsynth"
-
-		use tools || echo "CONFIG += deng_notools"
-
-		use openal && echo "CONFIG += deng_openal"
-		true
-
-	} > config_user.pri || die
-}
-
-#Usage: doom_make_wrapper <name> <game> <icon> <desktop entry title> [args]
-doom_make_wrapper() {
-	local name=$1 game=$2 icon=$3 de_title=$4
-	shift 4
-	games_make_wrapper $name "doomsday -game ${game} $@"
-	make_desktop_entry $name "${de_title}" ${icon}
-}
-
-src_configure() {
-	eqmake5 doomsday.pro
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	dodoc "${S}"/../README.md
-
-	mv "${D}/${GAMES_DATADIR}"/{${PN}/data/jdoom,doom-data} || die
-	dosym "${GAMES_DATADIR}"/doom-data "${GAMES_DATADIR}"/${PN}/data/jdoom
-
-	if use !dedicated ; then
-		if use snowberry ; then
-			python_replicate_script "${D}"/"${GAMES_BINDIR}"/launch-doomsday
-
-			installmodules() {
-				# relocate snowberry module directory recursively into site-packages
-				python_domodule "${D}/${GAMES_DATADIR}"/${PN}/snowberry
-				# hack around improper path handling
-				sed -i \
-					-e "s:os.chdir.*$:os.chdir('$(python_get_sitedir)/snowberry'):" \
-					"${D%/}$(python_get_scriptdir)"/launch-doomsday || die
-			}
-			python_foreach_impl installmodules
-			# remove old module dir
-			rm -r "${D}/${GAMES_DATADIR}"/${PN}/snowberry || die
-
-			make_desktop_entry launch-doomsday "Snowberry DoomsDay" snowberry
-			doicon ../snowberry/graphics/snowberry.png
-		fi
-
-		if use doom; then
-			local res_arg
-
-			if use resources; then
-				res_arg="-def \"${GAMES_DATADIR}\"/${PN}/defs/jdoom/jDRP.ded"
-			fi
-
-			doicon ../snowberry/graphics/orb-doom.png
-			doom_make_wrapper jdoom doom1 orb-doom "DoomsDay Engine: Doom 1" "${res_arg}"
-			elog "Created jdoom launcher. To play Doom place your doom.wad to"
-			elog "\"${GAMES_DATADIR}\"/doom-data"
-			elog
-
-			if use demo; then
-				doom_make_wrapper jdoom-demo doom1-share orb-doom "DoomsDay Engine: Doom 1 Demo" \
-					"-iwad \"${GAMES_DATADIR}\"/doom-data/doom1.wad ${res_arg}"
-			fi
-			if use freedoom; then
-				doom_make_wrapper jdoom-freedoom doom1-share orb-doom "DoomsDay Engine: FreeDoom" \
-					"-iwad \"${GAMES_DATADIR}\"/doom-data/freedoom/doom1.wad"
-			fi
-		fi
-		if use hexen; then
-			doicon ../snowberry/graphics/orb-hexen.png
-			doom_make_wrapper jhexen hexen orb-hexen "DoomsDay Engine: Hexen"
-
-			elog "Created jhexen launcher. To play Hexen place your hexen.wad to"
-			elog "\"${GAMES_DATADIR}\"/${PN}/data/jhexen"
-			elog
-		fi
-		if use heretic; then
-			doicon ../snowberry/graphics/orb-heretic.png
-			doom_make_wrapper jheretic heretic orb-heretic "DoomsDay Engine: Heretic"
-
-			elog "Created jheretic launcher. To play Heretic place your heretic.wad to"
-			elog "\"${GAMES_DATADIR}\"/${PN}/data/jheretic"
-			elog
-		fi
-	fi
-
-	prepgamesdirs
-}
diff --git a/games-fps/doomsday/doomsday-2.0.3.ebuild b/games-fps/doomsday/doomsday-2.0.3.ebuild
new file mode 100644
index 000000000000..c50b22ad60ee
--- /dev/null
+++ b/games-fps/doomsday/doomsday-2.0.3.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-r1 readme.gentoo-r1 cmake-utils
+
+DESCRIPTION="A modern gaming engine for Doom, Heretic, and Hexen"
+HOMEPAGE="http://www.dengine.net"
+SRC_URI="https://downloads.sourceforge.net/project/deng/Doomsday%20Engine/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3+ LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="fluidsynth openal +doom demo freedoom heretic hexen tools fmod"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	demo? ( doom ) freedoom? ( doom )
+"
+
+RDEPEND="
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtgui:5[-gles2]
+	dev-qt/qtcore:5
+	net-misc/curl
+	sys-libs/zlib
+	media-libs/assimp
+	fmod? ( media-libs/fmod )
+	fluidsynth? ( media-sound/fluidsynth )
+	openal? ( media-libs/openal )
+	tools? ( sys-libs/ncurses:0 )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+PDEPEND="
+	demo? ( games-fps/doom-data )
+	freedoom? ( games-fps/freedoom )
+"
+
+S="${WORKDIR}/${P}/${PN}"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+You need to copy Doom, Doom 2, Chex Quest, Heretic, Hexen, HexenDD,
+and Doom64 wads to a folder of your choice. Then configure in game
+engine where that folder is. This is different than old versions,
+which had centralized launchers for each game, and required the
+files to be in a specific place
+"
+
+internal_src_configure() {
+	export QT_SELECT=qt5
+	local mycmakeargs=(
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DDENG_ASSIMP_EMBEDDED=off
+	)
+	cmake-utils_src_configure
+}
+
+src_configure() {
+	python_foreach_impl internal_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/games-fps/doomsday/metadata.xml b/games-fps/doomsday/metadata.xml
index daf0c62634d3..851017e48a82 100644
--- a/games-fps/doomsday/metadata.xml
+++ b/games-fps/doomsday/metadata.xml
@@ -9,11 +9,10 @@
 		<flag name="demo">Install launcher dor doom1.wad from <pkg>games-fps/doom-data</pkg></flag>
 		<flag name="doom">Install launcher for jdoom game</flag>
 		<flag name="fluidsynth">Build the FluidSynth sound driver</flag>
+		<flag name="fmod">Enable support for fmod music and sound effects lib</flag>
 		<flag name="freedoom">Install launcher for doom1.wad from <pkg>games-fps/freedoom</pkg></flag>
 		<flag name="heretic">Install launcher for jheretic game</flag>
 		<flag name="hexen">Install launcher for jhexen game</flag>
-		<flag name="resources">Enable support for <pkg>games-fps/doomsday-resources</pkg> in jdoom launcher</flag>
-		<flag name="snowberry">Install Snowberry doomsday front-end</flag>
 		<flag name="tools">Build additional tools such as doomsday-shell, md2tool and texc</flag>
 	</use>
 	<upstream>
diff --git a/games-fps/warsow-community-map-pack/Manifest b/games-fps/warsow-community-map-pack/Manifest
deleted file mode 100644
index 18c69040787c..000000000000
--- a/games-fps/warsow-community-map-pack/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST warsow_comunity_map_pack_01.zip 130057143 BLAKE2B 227d0736a634ba2a03ff6f04c95b7f8d251fd63a39d184719c6977796547814a9dcf7690a62f379a21123f072039b2badde0e1f4bf7b9fce478b34073369b807 SHA512 47ea38467f6b88f4a8ceb0e38e2c12b62df46cbb62d1aebf7b824e71d80de1d65b81874960834055995c50f95de5f75f91b33fbf6985ee3121d823c8a5ca8dd7
-EBUILD warsow-community-map-pack-01.ebuild 606 BLAKE2B f439946c6aaed2c85e3cb81a0b30d1b6f7c41406d3412456622ff52e865457c04faac39ce0e5cbb7a0bfe015805ee06cc22da48e5d2c74b3faba2db642be733c SHA512 fe3c5616631cb37bd554324e2ed1ec319592adfd21bf522d76a57f4a587414365da534e1f89118e1001bc2c9b25da1c255f3ee4314248eedf24cfb862b2bfa06
-MISC metadata.xml 255 BLAKE2B 153eeac74bce2737ca6e67ec2e2425d59565ba6845334375d64be8bd51c25b01e68c4f6a536fdebc4c5bc1ff54f83eee22dc8981da809490ce39286f97ce899c SHA512 6d6ccdbd1026538693165380acda44c0e9496b703a8817c82629277d62948b7c29170398c8825e37ec70e19226cbdd9c41de573d6fc6286aaf786d241995307f
diff --git a/games-fps/warsow-community-map-pack/metadata.xml b/games-fps/warsow-community-map-pack/metadata.xml
deleted file mode 100644
index 7e3442868ea6..000000000000
--- a/games-fps/warsow-community-map-pack/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-  <email>games@gentoo.org</email>
-  <name>Gentoo Games Project</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/games-fps/warsow-community-map-pack/warsow-community-map-pack-01.ebuild b/games-fps/warsow-community-map-pack/warsow-community-map-pack-01.ebuild
deleted file mode 100644
index a283a3db5f79..000000000000
--- a/games-fps/warsow-community-map-pack/warsow-community-map-pack-01.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit games
-
-MY_P=${P//-/_}
-# They have a typo in their filename:
-MY_P=${MY_P/community/comunity}
-
-DESCRIPTION="Community Map Pack for the Warsow multiplayer FPS"
-HOMEPAGE="http://www.warsow.net/"
-SRC_URI="http://update.warsow.net/mirror/${MY_P}.zip"
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S=${WORKDIR}
-
-src_install() {
-	insinto "${GAMES_DATADIR}"/warsow
-	doins -r "${WORKDIR}"/{basewsw,previews}
-	dodoc "${WORKDIR}"/Readme.rtf
-	prepgamesdirs
-}
diff --git a/games-fps/worldofpadman/Manifest b/games-fps/worldofpadman/Manifest
index 366a291ad217..d484dc96d51b 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
 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 2130 BLAKE2B b7912145aecbd211ae429fbce671c1249b2698ea3c313cefa069a1392eff872a37dbb1812bb00b68a4bb97fad848a882b8c63c5d3b92c0e0b7fe7ceb05072383 SHA512 83a80680c74376a4aedf3dda3beaf7c5f96564f6ad5622bc7726089f1df8f0cfb295c68dc3681789ad8e075ea25e4d553506df4923dcd37a546adb7e6a574991
+EBUILD worldofpadman-1.6.ebuild 2078 BLAKE2B 7bdd18f3213490b5116b2222c0bc3dcaf715b643e82971e20345b7950f17f8fbb2fdea32a5f681bf5f58226be54e82fbb30e85dd8153e1e48cac0c234f700ba0 SHA512 5f8c4310b51f53e73e3d339f4fdb45c25412b954cb23b8c889dae91bd6124b31f2fbc64e3e1eca01689a88b61723b2f600840b405780ce8100314a598120c8ca
 MISC metadata.xml 421 BLAKE2B 0c13dc1221c5aa3f8ba78de2614ec62e48177ab0433652ec97ce454883b4a12ffe767ef6786f7f0ea5a75a2a67e868a01e771d7eb575c7ab8eeb4689ad5a8cdf SHA512 2716235255bd6e00d84c6f11f784850959fd50a6542fd98d9c7815d0c7a6f5a201807b02f1cd7d1ace59f1f19f40cb97aa01b9d649bb198678ac60f84d81eb1e
diff --git a/games-fps/worldofpadman/worldofpadman-1.6.ebuild b/games-fps/worldofpadman/worldofpadman-1.6.ebuild
index 0599fd617591..6fce51878abb 100644
--- a/games-fps/worldofpadman/worldofpadman-1.6.ebuild
+++ b/games-fps/worldofpadman/worldofpadman-1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,17 +16,12 @@ IUSE="+curl dedicated maps +openal +theora +vorbis"
 
 RDEPEND="sys-libs/zlib
 	!dedicated? (
-		|| (
-			(
-				>=media-libs/speex-1.2.0
-				media-libs/speexdsp
-			)
-			<media-libs/speex-1.2.0
-		)
-		virtual/jpeg:0
 		media-libs/libsdl[opengl,video,X]
-		virtual/opengl
+		>=media-libs/speex-1.2.0
+		media-libs/speexdsp
 		virtual/glu
+		virtual/jpeg:0
+		virtual/opengl
 		openal? ( media-libs/openal )
 		curl? ( net-misc/curl )
 		vorbis? ( media-libs/libvorbis )