gentoo resync : 03.11.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-11-03 16:06:58 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-11-03 16:06:58 +0000
commit: bd4aeefe33e63f613512604e47bfca7b2187697d (patch)
tree: adb35b5a9a00ee7ea591ab0c987f70167c23b597 /games-fps
parent: 48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff)
65 files changed, 437 insertions, 797 deletions
diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 8b4608e28d34..62b63aa580e8 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
diff --git a/games-fps/eduke32/Manifest b/games-fps/eduke32/Manifest
index 43da812473e5..487384f6313c 100644
--- a/games-fps/eduke32/Manifest
+++ b/games-fps/eduke32/Manifest
@@ -10,5 +10,5 @@ DIST duke3d_voxels-1.21.zip 2997999 BLAKE2B dcb3103a82b45cfcf906d00147a57fe47997
 DIST duke3d_xxx-1.33.zip 26586453 BLAKE2B 7e3c46172d3db1b2eb49eb07f243a9ead4f260d6b1dcae9f8bd599b8e9ba3a19068032afeb4ec2cf61742b6216e3a06c24f2b7e8903f9636f9d00f4d57ada47f SHA512 4783d159610fc178e748446b7a5f9c13d90e1aca3cef34deb82e99655b7f4a254f1130e16dbcfad9013b95bc07161d5c5dccfcc552fbb7a88404b4b9cedbadbf
 DIST eduke32_classic.png 5129 BLAKE2B 332ad44b7f6b4f51362387aa6870e7db54423ca5a1f0586cb5019322fb72317d8e88e0bbf46ac89b56290db7e2e4a8442179a6eb87a615fd741b5f00ce96a1c8 SHA512 b41dece8f1ddcadde3367a83f6029ffdc5805811b40380e270169684fb3b368258bd8caeb55623dadffb6fb9d72faf9a3d75907722623f4fac94a4347f8ce833
 DIST eduke32_src_20190919-8133.tar.xz 15940944 BLAKE2B 8c00579694d068c8a433a4d124dfd84249671ad71fa3fc23ef64fb5a9a63c2f7abb662fd017a1c72bd9a62171e93aea57dbdbd257970c9a96f436e090c2eb18c SHA512 4e4cd724d2852335b205be970f17a60062f3eeffc76923bed362a685357082b4f328a76f8a7d2a7b98e039f25f32bc5b0a1178ceb84c7d52206384bf1a06c976
-EBUILD eduke32-20190919.8133.ebuild 6040 BLAKE2B 91b1a6c2aa4661891aa332b4bcf3aefd1e1f2c4cbd345cf3c3363121c857f8d4989fab8b38302eae2be40e646bbfc258f80e0dd48e1fa1354c2426834f75d216 SHA512 e2440363154f691ca20df67dc335abf497ce93863057a0a30e9c442e09c31ec4821837d0546cc4ecc77d162e631383be8002a53f7abd3880b3915632aa8ed133
+EBUILD eduke32-20190919.8133-r1.ebuild 5991 BLAKE2B 4f4a68f1615c3aae8368d0acbdb4b4667804367ee7dc198a9e3430449b2a80ac2b8a90925570b5928795993061b38ad7aacf18c11af237390633b1d6ef95a0f3 SHA512 016e9ef5f6d0616b745a657b708c49169aee53dcbd4bbb39ed159bee63a8a6347f958280f420312acf13a0acd84374d3a26f73dd889734342373c58fb2a21d08
 MISC metadata.xml 1727 BLAKE2B 3448f8633a915311ffb9ccc6d53bf8a94928df2625eaba9e21952dab0c6eb6ec1d5da514c8ad6f810a94005571e69d1d00d1d4ecc2e2afc6ea99ee5aa9de73f5 SHA512 8aeb500968ff3b161f244cc0374f9d6b2261ad11104f92f496ab501675cc50e68981a28f0482b06845a2e058ac63464db92c0250373d2036c249739e2954063a
diff --git a/games-fps/eduke32/eduke32-20190919.8133.ebuild b/games-fps/eduke32/eduke32-20190919.8133-r1.ebuild
index 077270c51ba9..bfa718b76ccc 100644
--- a/games-fps/eduke32/eduke32-20190919.8133.ebuild
+++ b/games-fps/eduke32/eduke32-20190919.8133-r1.ebuild
@@ -51,7 +51,7 @@ RESTRICT="bindist"
 
 S="${WORKDIR}/${PN}_${MY_DATE}-${MY_BUILD}"
 
-MY_DEPEND_RDEPEND="
+RDEPEND="
 	media-libs/libsdl2[joystick,opengl?,sound,video]
 	media-libs/sdl2-mixer[flac?,fluidsynth?,midi,timidity?,vorbis?]
 	sys-libs/zlib:=
@@ -62,7 +62,6 @@ MY_DEPEND_RDEPEND="
 		virtual/opengl
 	)
 	png? ( media-libs/libpng:0= )
-	timidity? ( media-sound/timidity-freepats )
 	vpx? ( media-libs/libvpx:= )
 	vorbis? (
 		media-libs/libogg
@@ -71,14 +70,14 @@ MY_DEPEND_RDEPEND="
 	xmp? ( media-libs/exempi:= )
 "
 
-RDEPEND="
-	${MY_DEPEND_RDEPEND}
+DEPEND="
+	${RDEPEND}
 	cdinstall? ( games-fps/duke3d-data )
 	demo? ( games-fps/duke3d-demodata )
+	timidity? ( media-sound/timidity++ )
 "
 
-DEPEND="
-	${MY_DEPEND_RDEPEND}
+BDEPEND="
 	app-arch/unzip
 	x86? ( dev-lang/nasm )
 "
diff --git a/games-fps/enemy-territory-etpro/Manifest b/games-fps/enemy-territory-etpro/Manifest
deleted file mode 100644
index f4769d1832f0..000000000000
--- a/games-fps/enemy-territory-etpro/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST etpro-3_2_6.zip 3698539 BLAKE2B 08179b55e4c3dacdde65e12a94946f28e9f28d32c989a408bf53af7480b41d4ae442c2309ead867f8745d5b575380430b931a5cefa06f0280bc2f5eca17140da SHA512 366da5b7aaaa4b88da050aca95342425cba855182c59bf2fbe104252cc2241f79be629ae5dc15f9c396284910eb63721db01fc0aa02303cc51015d36263db9de
-EBUILD enemy-territory-etpro-3.2.6-r1.ebuild 537 BLAKE2B c9073ed33d089d1796530a6fd6c357912a2dd39d3c21b5123d7f8dba746d2deac832f8f470ba9b80eecaa59bb433afd636b4bb317538f62d69a2c245a9b5d044 SHA512 52ef43888d08678aab3a6caed4a080272b786d804cf10ecf266d0d969cb5845c0024cbe8d507df77598719f5ba5374ab04dce7878069fdc379ce3a4f78efabf9
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/enemy-territory-etpro/enemy-territory-etpro-3.2.6-r1.ebuild b/games-fps/enemy-territory-etpro/enemy-territory-etpro-3.2.6-r1.ebuild
deleted file mode 100644
index d86355ef1353..000000000000
--- a/games-fps/enemy-territory-etpro/enemy-territory-etpro-3.2.6-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-GAME="enemy-territory"
-MOD_DESC="Minor additions to Enemy Territory to make it more fun"
-MOD_NAME="ETPro"
-MOD_DIR="etpro"
-
-inherit games games-mods
-
-HOMEPAGE="http://etpro.anime.net/"
-SRC_URI="http://bani.anime.net/etpro/etpro-${PV//./_}.zip
-	http://www.enemyterritory.sk/files/etpro-${PV//./_}.zip"
-
-LICENSE="all-rights-reserved"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated opengl"
-
-QA_PREBUILT="${INS_DIR:1}/${MOD_DIR}/*so"
diff --git a/games-fps/enemy-territory-etpro/metadata.xml b/games-fps/enemy-territory-etpro/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/enemy-territory-etpro/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/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index cbe1cfdc12da..1ac67f3946c1 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,5 +1,5 @@
-AUX gzdoom-4.2.1-Introduce-the-BUILD_NONFREE-option.patch 1045 BLAKE2B 642f7d083c577f71336865396cba1c07a68bdf0766033825168689069a12ce18ad062fa4e631f9ce545b392cee35d05f348b5ee41f853c6b374f16e114235380 SHA512 5cae0b86d045285a86f79ed63d7dfa047412241de724f948e6a0cc98412ef1f9f5c119971dfa38fcd2009a00a5bae57e72c8d25b2aedbd7e8eac284e73a53129
+AUX gzdoom-4.2.1-Introduce-the-BUILD_NONFREE-option.patch 1066 BLAKE2B 9c47664abd809215d3691edcf434e6b1bb22e52ffa08aeea00c7f057719f909b6ce94833fe7e71ed582f1cc3490bbe7a843d911d1b24bef2c53c9f5f808edb3b SHA512 fc3ccd4ccd9994e0544e8e56255ad9d065ef11a004be8fc0a41ee39309d2a05f38b7381193c1c0de8da6bba69bc6212dc1e7c73a93435f781625fe29464e8611
 AUX gzdoom-4.2.1-install_soundfonts.patch 1379 BLAKE2B 5ce4ee6fe06d5185a1b2fae5b70ed195e61d405d5c5b5973a1409244e657a4899017e16c28574add1d9ff37d4ee02444ff3e162197ad222d5c0990e7c40a9f91 SHA512 2ce0032b5246337c8e1ae80b254ec676460a54d19366902ad30042bfd9c2ae2c92354ab13631affa514bb7c47100c38bdec7b9d76695f2fd0281486a7d7d85dd
-DIST gzdoom-4.2.1.tar.gz 13660636 BLAKE2B f1399014441d1556cc16e8d89b8c321a0591996fbcf8ad85a99403faef3b4663636b2bc4543982f2fc9ebdba777e88e4685985390d2e798eb01c0cea683305f6 SHA512 37a21bf101442cbe36574666dfb92b28eeee6b4dc982d43a8d5c95255e1f49e2451740b54e100b59120cef67f68f6eb07f687155bbab712854ce7ddc7c0b6c4a
-EBUILD gzdoom-4.2.1.ebuild 2011 BLAKE2B 0cafc8def0d1c6016326def8b7c69bee2560a7e886f234b54cfd143b47d24b317aa2b6f1024e5ce48587836d68869424c02cc480030dad1fce9e418b33e33383 SHA512 228ccd6946232e33b2e70ac01c89eea76d67d3d685672aeae4c9b21cc419488e000f85e93922f7defae72f282790b4b05e903f5ec9f90924888e145e596a0b9f
+DIST gzdoom-4.2.3.tar.gz 13682309 BLAKE2B 33bc9b2c3a28b9b692bd2b28ba45dce95274f78eb42b18c17e48b546b5b5f0c19fe09fd9c36fbb27bae4b1235dd8f0bddde0e67e46d07ea3bca776e6768e697a SHA512 d73b643f2ec6dbf7daa5048ba2db0f18968fb054ca9585dd07f18d20707efbe8e41cc3d8b4520d793d9d32ff34e1a6c74b2eaf84d0192d02263b907f5b3bbbc6
+EBUILD gzdoom-4.2.3.ebuild 2026 BLAKE2B af9dfea1254c1bfee784b600f184197c3ba81897d08fbdaa39b803d403f0259ec40a17f2f812e18be2c76597bd18cb597725ce3950edc571f832490f3d2cee15 SHA512 443f16d0c6e947747338d4f2f1a750d9becbb75e9caebd3227b41a468d68c8bc982ef2e01312b6f70ba7c41149793371e3bac251de5aa39990a50d02d7ad4148
 MISC metadata.xml 940 BLAKE2B 85d6dcb7986f8a27f1ad929abe60899e01709bb8778668a0cda11ac7c3c4f33349bb832dcdc369e7c136ba022d6ac6673565cb674cb9f642157fc89c9b678e72 SHA512 c27939efdfa612bfea201fd4f1e4399c050b5d0244cb7be914dc1b033f4f09c5614b5f226a9ce29c07cfb31247133a8b69bc81274ddf5b38e159287a85a97a30
diff --git a/games-fps/gzdoom/files/gzdoom-4.2.1-Introduce-the-BUILD_NONFREE-option.patch b/games-fps/gzdoom/files/gzdoom-4.2.1-Introduce-the-BUILD_NONFREE-option.patch
index c74d08a24a47..5a8460e64199 100644
--- a/games-fps/gzdoom/files/gzdoom-4.2.1-Introduce-the-BUILD_NONFREE-option.patch
+++ b/games-fps/gzdoom/files/gzdoom-4.2.1-Introduce-the-BUILD_NONFREE-option.patch
@@ -9,14 +9,13 @@ and game_support.pk3) if they so desire.
  CMakeLists.txt | 9 +++++++--
  1 file changed, 7 insertions(+), 2 deletions(-)
 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7860358ef..23d317f42 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -404,10 +404,15 @@ add_subdirectory( libraries/lzma )
- add_subdirectory( tools )
- add_subdirectory( libraries/dumb )
- add_subdirectory( libraries/gdtoa )
+diff -Naur a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	2019-10-20 15:16:08.000000000 +0100
++++ b/CMakeLists.txt	2019-10-24 21:27:58.104006569 +0100
+@@ -444,10 +444,15 @@
+ add_subdirectory( libraries/wildmidi )
+ add_subdirectory( libraries/oplsynth )
+ add_subdirectory( libraries/zmusic )
 +
  add_subdirectory( wadsrc )
 -add_subdirectory( wadsrc_bm )
diff --git a/games-fps/gzdoom/gzdoom-4.2.1.ebuild b/games-fps/gzdoom/gzdoom-4.2.3.ebuild
index baca2173701c..e59ca4147566 100644
--- a/games-fps/gzdoom/gzdoom-4.2.1.ebuild
+++ b/games-fps/gzdoom/gzdoom-4.2.3.ebuild
@@ -30,9 +30,10 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}-g${PV}"
+
 PATCHES=(
-	"${FILESDIR}/${P}-install_soundfonts.patch"
-	"${FILESDIR}/${P}-Introduce-the-BUILD_NONFREE-option.patch"
+	"${FILESDIR}/${PN}-4.2.1-install_soundfonts.patch"
+	"${FILESDIR}/${PN}-4.2.1-Introduce-the-BUILD_NONFREE-option.patch"
 )
 
 src_prepare() {
diff --git a/games-fps/openarena/Manifest b/games-fps/openarena/Manifest
index 523e9d5cc047..c1d114c9fff4 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-r1.ebuild 1790 BLAKE2B 84b530c8efd5617b062b4194e885ad41dcb23cace4a48d5d5c6460e32839ccc99ccd1695c1322916418be6cfad4956c74d1c2eac86a9a93eb4b77b737622260c SHA512 fa0c3302527b579bde188c1c44d928026181d5ccf1e88a871583d1ad0394a56e5d6dc2cdd907e603e52b155e1ee76bc9a99cd43397fa6ed8081487890975d987
-MISC metadata.xml 329 BLAKE2B e35a14a26bbcd2aa34d851acbc510d5e4ba3fa9ee9dc9ecc1c75995c6b8d3f0aea569f55c402295f1835e71d2d8609c226ccd20f9c4f5819c071c54e7d19e08b SHA512 40e88c8cec824e6c3d815516c018292ec64e5b968ede35a4c3c235331cfb32370ceffa954f01ceedffbf64e182f4e6c753a5fe45ce2ed627b6383dfc6b0d39f7
+EBUILD openarena-0.8.8-r1.ebuild 1911 BLAKE2B 825ee6fc8d839122a4e0fe2da8de4c599aeb92fcb579fda0633cb9afdd60284de03edfe41595e763e1693de4082f9b4d8696c2ffb0bd575e164d03bdd612311a SHA512 26de5700a85fb8cd13ce73969a4fc31321f43f0fc17edcd30dbbd218f9e855986a50f1aa298dadee61cc5ec77319d0e1f517df45414468cc65301d3f55cf8da2
+MISC metadata.xml 396 BLAKE2B 1457ec17fbb8fa1311f5253cd12de320970e2b1b6b00d75d7db0928a21a39fc9f4c7a86200e2d4ffe0268f9441d8a9b873916cb07a0210bcd90046db4e15a632 SHA512 5e48680d31da1d95af2d427e4658d77a882d8d088ccdcd40c454fac2e3c2ab1b6ec4b79d6a3ee851fd1f30452440df1e218c6b8819d35a70052fb2f4a3239112
diff --git a/games-fps/openarena/metadata.xml b/games-fps/openarena/metadata.xml
index fb6c4d02068e..ec45d585b91b 100644
--- a/games-fps/openarena/metadata.xml
+++ b/games-fps/openarena/metadata.xml
@@ -5,6 +5,9 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
+	<use>
+		<flag name="client">Build OpenArena client</flag>
+	</use>
 	<upstream>
 		<remote-id type="sourceforge">oarena</remote-id>
 	</upstream>
diff --git a/games-fps/openarena/openarena-0.8.8-r1.ebuild b/games-fps/openarena/openarena-0.8.8-r1.ebuild
index 7440f19e8ec0..f9a04f80a0b2 100644
--- a/games-fps/openarena/openarena-0.8.8-r1.ebuild
+++ b/games-fps/openarena/openarena-0.8.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,21 +12,23 @@ SRC_URI="mirror://sourceforge/oarena/${P}.zip
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+curl +openal +vorbis"
+IUSE="+client +curl +openal +vorbis"
 
 RDEPEND="
-	media-libs/libsdl[joystick,opengl,video]
-	media-libs/speex
-	media-libs/speexdsp
-	virtual/jpeg:0
-	virtual/opengl
-	x11-libs/libXext
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	curl? ( net-misc/curl )
-	openal? ( media-libs/openal )
-	vorbis? ( media-libs/libvorbis )
+	client? (
+		media-libs/libsdl[joystick,opengl,video]
+		media-libs/speex
+		media-libs/speexdsp
+		virtual/jpeg:0
+		virtual/opengl
+		x11-libs/libXext
+		x11-libs/libX11
+		x11-libs/libXau
+		x11-libs/libXdmcp
+		curl? ( net-misc/curl )
+		openal? ( media-libs/openal )
+		vorbis? ( media-libs/libvorbis )
+	)
 "
 DEPEND="${RDEPEND}
 	app-arch/unzip
@@ -52,6 +54,7 @@ src_compile() {
 	# also build always server and use smp by default
 	myopts="USE_INTERNAL_SPEEX=0 USE_VOIP=1 USE_MUMBLE=0
 		BUILD_SERVER=1 BUILD_CLIENT_SMP=1 USE_LOCAL_HEADERS=0"
+	use client || myopts="${myopts} BUILD_CLIENT=0"
 	use curl || myopts="${myopts} USE_CURL=0"
 	use openal || myopts="${myopts} USE_OPENAL=0"
 	use vorbis || myopts="${myopts} USE_CODEC_VORBIS=0"
@@ -67,7 +70,7 @@ src_compile() {
 
 src_install() {
 	cd "${MY_S}"/"${BUILD_DIR}"
-	newbin openarena-smp.* "${PN}"
+	use client && newbin openarena-smp.* "${PN}"
 	newbin oa_ded.* "${PN}-ded"
 	cd "${S}"
 
@@ -75,6 +78,8 @@ src_install() {
 	doins -r baseoa missionpack
 
 	dodoc CHANGES CREDITS LINUXNOTES README
-	newicon "${MY_S}"/misc/quake3.png ${PN}.png
-	make_desktop_entry ${PN} "OpenArena"
+	if use client; then
+		newicon "${MY_S}"/misc/quake3.png ${PN}.png
+		make_desktop_entry ${PN} "OpenArena"
+	fi
 }
diff --git a/games-fps/ut2003-bonuspack-cm/Manifest b/games-fps/ut2003-bonuspack-cm/Manifest
index 541f03a647ed..46d626a2e9b4 100644
--- a/games-fps/ut2003-bonuspack-cm/Manifest
+++ b/games-fps/ut2003-bonuspack-cm/Manifest
@@ -1,3 +1,3 @@
-DIST cbp2003.zip 149198671 BLAKE2B c5f7352b7fb1e0e6a18c99a6212cd5cb4e5e6144988534f91aed93bf33b031d437e86eebf239f0a49fa20b90ca0ded09e912a96b798bc855d527423f2a299ba7 SHA512 92e136c03f1385a28163718cc6ef1c36e46fbad14c74d0f266dfe3d9f4a5093e1bd02dde54e68f70539ba2c4ee163b1e886529f7e734059a85223ab6f853a474
-EBUILD ut2003-bonuspack-cm-1.ebuild 804 BLAKE2B 9b9ff47b5b215f19e26869d9b93a1ae754fbaadac5dadd9f801bf8a02bff23677c3ba76221b3ebd10853d0da5de7e7155efaf1b1b77561d92528a99ed44e2530 SHA512 4547eaf2d2af3facaf159832f8c85afc984c32f2f3cf40e466e163fc75e9c5e274a451889cd8f8e198322eb2dc2c9523124c2722f26010cf6749ebb32d661204
+DIST cbp2003.zip 149198696 BLAKE2B d6319e3605752e309411b16358696cdf0559b3cc6acedfae2f063eedb4ee98fefb470e9ff601cdce46821eaaa3f7c0ef3c13ddc2ce3639842ec98e1e68fefb85 SHA512 382ea605b7ce89654b7a58dfd1b36f0624bb0ac63aff6a07f1942dd3c8715ac6d79812828f2f28e2bd1b162673147e0ab8653ac67b4ee5d936e8840dede8e408
+EBUILD ut2003-bonuspack-cm-1.ebuild 809 BLAKE2B f23c553ce6f765adc800445fe37344a2cf59f89e28c36445eb4760e08f31bccbea3a81e0b1c49de4786c5490d765ccb5b5686865c3e62d60e4deca13f8b4b79a SHA512 960bde355c1c4e2a21c502774564626edf48a08c43d861130237a35722766cb643196310d152371040d33186182659f41879e48e245fa83da2ee278c3ce6ed23
 MISC metadata.xml 771 BLAKE2B 705c6aa979f650220a52db3ef5d8c5b8b468b28eac8692a2fbe583ed4b3f694fdfe088d64cc3f6d8506494522f8ca11b491e21e322e3f50ff4453e93ce0d543f SHA512 d30d55503e3b3897d2a5093c06a39f684bdf0879214931a360a87637cd62ae1ca019577f42275bf2b4ba28649ab2989b0a2e184998497ddc5ffddbb6ba35ef5e
diff --git a/games-fps/ut2003-bonuspack-cm/ut2003-bonuspack-cm-1.ebuild b/games-fps/ut2003-bonuspack-cm/ut2003-bonuspack-cm-1.ebuild
index 5e55eb9e9519..d42bd801c5ed 100644
--- a/games-fps/ut2003-bonuspack-cm/ut2003-bonuspack-cm-1.ebuild
+++ b/games-fps/ut2003-bonuspack-cm/ut2003-bonuspack-cm-1.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit games
 
-IUSE=""
+inherit games unpacker
+
 DESCRIPTION="Community Bonus Pack for UT2003"
 HOMEPAGE="https://liandri.beyondunreal.com/Unreal_Tournament_2003"
-SRC_URI="https://ut.rushbase.net/beyondunreal/mods/cbp2003.zip"
+SRC_URI="https://downloads.unrealadmin.org/UT2003/BonusPack/cbp2003.zip"
 
 LICENSE="ut2003"
 SLOT="1"
@@ -24,7 +24,7 @@ dir=${GAMES_PREFIX_OPT}/ut2003
 Ddir=${D}/${dir}
 
 src_unpack() {
-	unzip -qq "${DISTDIR}"/${A} || die
+	unpack_zip "${DISTDIR}"/${A}
 }
 
 src_install() {
diff --git a/games-fps/ut2004-action/Manifest b/games-fps/ut2004-action/Manifest
deleted file mode 100644
index 5a30410ccc89..000000000000
--- a/games-fps/ut2004-action/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST aut-r1-msuc.zip 323878282 BLAKE2B 509036928b33697926d81e920cb9ca3496549d1024f33912d8de48d5328cd4a20cf5412b4c3ebf4d3e0f3dbba347d486c3d2ed4a14185e817e7aad4b560312ee SHA512 50aafff330839c9b8fe8be2e6a98d9532f8429e2a8f258a9a6dabd39f555a9ce11f9178592575996ebce2629ff5c7f3046777bc1605f21c2bbefb80e11ca4f65
-EBUILD ut2004-action-1.ebuild 536 BLAKE2B f9a8b6470101b6f78a4c92286177717a8b741dd0b5bd05f60ce320773417cdf7af19c447399764de869b6c5e9cf2dcc2e9bbb554f97dbd28f39160705cbcb059 SHA512 a1024f140abc613ffbf31feb2958be91aaddbc62b4013e920226c4ecf36bd2b31e043c6bc1c359454e7c9092447220795c7a07699f686fff2843b458479b0f40
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004-action/metadata.xml b/games-fps/ut2004-action/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/ut2004-action/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/ut2004-action/ut2004-action-1.ebuild b/games-fps/ut2004-action/ut2004-action-1.ebuild
deleted file mode 100644
index d4dca4341dda..000000000000
--- a/games-fps/ut2004-action/ut2004-action-1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MOD_DESC="Action movie mod"
-MOD_NAME="Action"
-MOD_DIR="action"
-MOD_ICON="aut.ico"
-
-inherit games games-mods
-
-HOMEPAGE="https://www.moddb.com/mods/action-unreal-tournament/addons/action-unreal-tournament-r1"
-SRC_URI="https://ut.rushbase.net/beyondunreal/mods/aut-r1-msuc.zip"
-
-LICENSE="freedist"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated opengl"
-
-src_unpack() {
-	mkdir ${MOD_DIR} || die
-	cd ${MOD_DIR} || die
-	unpack ${A}
-}
diff --git a/games-fps/ut2004-airbuccaneers/Manifest b/games-fps/ut2004-airbuccaneers/Manifest
deleted file mode 100644
index 33e3528d76b1..000000000000
--- a/games-fps/ut2004-airbuccaneers/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST airbuccaneers_mod_1_6_zipinstall_with_info.zip 255641963 BLAKE2B 24ac4e58a1a075430f92fcef1f8223e4d64d5fcb65af2bd3df0a4dde975422beacc45c7baa41683bb74365b448cbf59d1e26f6d80d7ef5edd73f320d6732fe3f SHA512 6c91919538b1d74157bf5586b66effcd3aabd397dc698384673425a53227c68b1ec0c4a07c342e399136673dc106b11727103ca6a06dff117d93b73645bd981b
-EBUILD ut2004-airbuccaneers-1.6-r2.ebuild 505 BLAKE2B be1705acc1cb5bddc28007c1d4441e383ab16bfec1e0b3e3440ebc96ae34571e73bc05bcf375f88a4afd2b92a82dab34300fb1a9eca683c539045e439139db09 SHA512 bee4df2d19965b8c9e80cc1b788e0f08daa67554b06de6e001d5806b0f31a841df93cc830032909f792bec44300a02091ea5764cc91e314ea0559131d6792ccc
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004-airbuccaneers/metadata.xml b/games-fps/ut2004-airbuccaneers/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/ut2004-airbuccaneers/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/ut2004-airbuccaneers/ut2004-airbuccaneers-1.6-r2.ebuild b/games-fps/ut2004-airbuccaneers/ut2004-airbuccaneers-1.6-r2.ebuild
deleted file mode 100644
index e8d587664787..000000000000
--- a/games-fps/ut2004-airbuccaneers/ut2004-airbuccaneers-1.6-r2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MOD_DESC="Pirate-style conversion with flying wooden ships"
-MOD_NAME="Air Buccaneers"
-MOD_DIR="AirBuccaneers"
-MOD_ICON="Help/abuicon.ico"
-
-inherit games games-mods
-
-HOMEPAGE="http://www.ludocraft.com/entertainment/airbuccaneers-mod/"
-SRC_URI="http://bin.ludocraft.com/files/airbuccaneers_mod_1_6_zipinstall_with_info.zip"
-
-LICENSE="freedist"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated opengl"
diff --git a/games-fps/ut2004-bonuspack-cbp1/Manifest b/games-fps/ut2004-bonuspack-cbp1/Manifest
index d79404a5906a..1049e9498f29 100644
--- a/games-fps/ut2004-bonuspack-cbp1/Manifest
+++ b/games-fps/ut2004-bonuspack-cbp1/Manifest
@@ -1,3 +1,3 @@
 DIST cbp1.zip 144163647 BLAKE2B ff32fbf431475ae2c24920574e5d158c4242fca2359bf1817131e189c0cd25e52d17de3232acb0b118d7f689ee67821cf6707a2e416e1a9b3f2b5f2e8fbcca86 SHA512 e2ead75796fd68b3f0d6ea50b4ed9988fef043730c6b81487d34c45aa26f63cac7b6a43991b673fbd6315f1496d2eecc52a5845c12f244411cd71fedab93c6fd
-EBUILD ut2004-bonuspack-cbp1-1-r2.ebuild 473 BLAKE2B 78ba7ef84beeebf910ed6a9116a4a99ac79443ef85bbbce36a37f07b3f8422bbe0c4c17c4266a19966190639fe9df8ae832c77d59edea19379af0cc36fd855dc SHA512 448eb5ef971f6256c7b95735f6bc5af52300c69f72999b93bd594cd7f77b44e072bc663a498bf75f9756a809113bab76a130315af4c26eaf393bf37b46fec362
+EBUILD ut2004-bonuspack-cbp1-1-r3.ebuild 532 BLAKE2B 616c2ee44b85a6d6a0e8f88e61f2845623aa1a6907f40762a21ddd5ee8ca90cfd8df79cdeec931cf15c8a8dc1cc53048f0847bfdd7c3c5a6788c92c2f851d901 SHA512 8eed5c3bb018af4b4d62009945136f7e1a271084e5445ea55327035f97bd6ad730fcecfe526822d8bc58a06be4ffeaa8341b246a014e3f525ac12e230fb21055
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004-bonuspack-cbp1/ut2004-bonuspack-cbp1-1-r2.ebuild b/games-fps/ut2004-bonuspack-cbp1/ut2004-bonuspack-cbp1-1-r2.ebuild
deleted file mode 100644
index 3a2c9a8576d8..000000000000
--- a/games-fps/ut2004-bonuspack-cbp1/ut2004-bonuspack-cbp1-1-r2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MOD_DESC="UT2003 Community Bonus Pack for UT2004"
-MOD_NAME="Community Bonus Pack Vol 1"
-
-inherit games games-mods
-
-HOMEPAGE="https://liandri.beyondunreal.com/Unreal_Tournament_2004"
-SRC_URI="http://downloads.unrealadmin.org/UT2004/BonusPack/cbp1.zip
-	http://files.volved.com/qsr/ut2004_map_packs/cbp1.zip"
-
-LICENSE="freedist"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/games-fps/ut2004-bonuspack-cbp1/ut2004-bonuspack-cbp1-1-r3.ebuild b/games-fps/ut2004-bonuspack-cbp1/ut2004-bonuspack-cbp1-1-r3.ebuild
new file mode 100644
index 000000000000..fefd2792ecc6
--- /dev/null
+++ b/games-fps/ut2004-bonuspack-cbp1/ut2004-bonuspack-cbp1-1-r3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="UT2003 Community Bonus Pack for UT2004 Volume 1"
+HOMEPAGE="https://liandri.beyondunreal.com/Unreal_Tournament_2004"
+SRC_URI="https://ut2004.ut-files.com/BonusPacks/cbp1.zip"
+LICENSE="freedist"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="strip"
+
+BDEPEND="app-arch/unzip"
+RDEPEND="|| ( games-fps/ut2004 >=games-server/ut2004-ded-3369.3-r2 )"
+
+S="${WORKDIR}"
+
+src_install() {
+	insinto /opt/ut2004
+	doins -r *
+}
diff --git a/games-fps/ut2004-bonuspack-cbp2/Manifest b/games-fps/ut2004-bonuspack-cbp2/Manifest
index 6b55c624b5b1..6bb521f4f68f 100644
--- a/games-fps/ut2004-bonuspack-cbp2/Manifest
+++ b/games-fps/ut2004-bonuspack-cbp2/Manifest
@@ -1,4 +1,4 @@
 DIST cbp2-volume1_zip.zip 203766207 BLAKE2B 7f7d19f4a1a1caaf388eccecadb8123a103d4aafbb95f2b344e106b881507f9bac0ffdda48435be7c2303b8bd70545d3d74ca7971f97a989bfa955d3155d956c SHA512 9e425985640f9fcf9c1696d75e0794b31110715ba3bf664087ede1f1925a68e76e4ee87d248b245429702c2bffc1fb16362fcc43f795681efcc5880a2a7c3213
 DIST cbp2-volume2_zip.zip 200444127 BLAKE2B 21d61d09af54e86047d46cc8d136cd6ba746098c4d0a53ade1e8e5c4143b543f0a90eb0dbca2cb00e29754f916dc84e7040a5d64f582bedd2a0107bb4c182291 SHA512 52982b302bb2d8f0839392f8bad05935bb8c5cae9e98528dfada7fa80f595050829ff6872b834197486c3401256f60c6c023133f6446299cbd72e1fd7ec3c8f4
-EBUILD ut2004-bonuspack-cbp2-1-r2.ebuild 857 BLAKE2B c6fda00042d988e77915e9afd736f03f7072296bb0bfe5cf4c0c9cd49d81b7fbaa84f0ea39270012e709ae9985c335b93cf772a9994bb4fb1762a5d6e8df5633 SHA512 b5fa77133c8420a01782124d22570585251c6cee7877648c4e209c1f0c2b432dd09052c5f15956524080ac6f520590a8aa0a67b02b9797d6fbb8e3ec0db08d13
+EBUILD ut2004-bonuspack-cbp2-1-r3.ebuild 1013 BLAKE2B 65affde00f8af3ee2185ad7e422d01d30ea6a469f22983535fcb70d0ef7665f49695876d7f0851adf02c45148b61ff3748cc21f98a68bd8e8210c241ee05c215 SHA512 1263bed67a955c265fada3a1499d3144d4f1a1a15aa0ba6d9f61fe585c877e14cab6be245719695dd3f97c03cea968590e63b1dc34be26f65f6f6259919d7cd5
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004-bonuspack-cbp2/ut2004-bonuspack-cbp2-1-r2.ebuild b/games-fps/ut2004-bonuspack-cbp2/ut2004-bonuspack-cbp2-1-r2.ebuild
deleted file mode 100644
index d1d4cee91dde..000000000000
--- a/games-fps/ut2004-bonuspack-cbp2/ut2004-bonuspack-cbp2-1-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MOD_DESC="Community Bonus Pack 2 Vol 1 and 2"
-MOD_NAME="Community Bonus Pack 2 Vol 1 and 2"
-
-inherit games games-mods
-
-HOMEPAGE="https://liandri.beyondunreal.com/Unreal_Tournament_2004"
-SRC_URI="https://ut.rushbase.net/beyondunreal/official/ut2004/cbp2-volume1_zip.zip
-	https://ut.rushbase.net/beyondunreal/official/ut2004/cbp2-volume2_zip.zip"
-
-LICENSE="freedist"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="games-fps/ut2004-bonuspack-cbp1
-	games-fps/ut2004-bonuspack-mega"
-
-src_prepare() {
-	# Provided by ut2004-bonuspack-cbp1
-	rm Music/Soeren.ogg
-	# Provided by ut2004-bonuspack-mega
-	rm Textures/Ty_RocketTextures.utx
-
-	cd Help
-	# Useless orphan file
-	rm Note.txt
-	mv GERROIDREADME.txt DOM-CBP2-Gerroid.txt
-	mv Readme.txt CBP2-Readme.txt
-}
diff --git a/games-fps/ut2004-bonuspack-cbp2/ut2004-bonuspack-cbp2-1-r3.ebuild b/games-fps/ut2004-bonuspack-cbp2/ut2004-bonuspack-cbp2-1-r3.ebuild
new file mode 100644
index 000000000000..c14a79c5917f
--- /dev/null
+++ b/games-fps/ut2004-bonuspack-cbp2/ut2004-bonuspack-cbp2-1-r3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="UT2004 Community Bonus Pack 2 Volume 1 and 2"
+HOMEPAGE="https://liandri.beyondunreal.com/Unreal_Tournament_2004"
+SRC_URI="https://ut2004.ut-files.com/BonusPacks/cbp2-volume1_zip.zip
+	https://ut2004.ut-files.com/BonusPacks/cbp2-volume2_zip.zip"
+LICENSE="freedist"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="strip"
+
+BDEPEND="app-arch/unzip"
+RDEPEND="|| ( games-fps/ut2004 >=games-server/ut2004-ded-3369.3-r2 )
+	games-fps/ut2004-bonuspack-cbp1
+	games-fps/ut2004-bonuspack-mega"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	default
+
+	# In ut2004-bonuspack-cbp1.
+	rm Music/Soeren.ogg || die
+
+	# In ut2004-bonuspack-mega.
+	rm Textures/Ty_RocketTextures.utx || die
+
+	# Useless file.
+	rm Help/Note.txt || die
+
+	cd Help || die
+	mv Readme.txt CBP2-Readme.txt || die
+	mv GERROIDREADME.txt DOM-CBP2-Gerroid.txt || die
+	mv Tydal.txt DM-CBP2-Tydal.txt || die
+}
+
+src_install() {
+	insinto /opt/ut2004
+	doins -r *
+}
diff --git a/games-fps/ut2004-bonuspack-ece/Manifest b/games-fps/ut2004-bonuspack-ece/Manifest
index 39652d72e6e5..5a137dd025d6 100644
--- a/games-fps/ut2004-bonuspack-ece/Manifest
+++ b/games-fps/ut2004-bonuspack-ece/Manifest
@@ -1,4 +1,4 @@
 DIST UT2004-ONSBonusMapPack.zip 11018471 BLAKE2B bc915d6942c321df4031b02eaa25f83793b3fa1f2bb916c5d413c5569a3f887b6517fc4dceb8cb914e22be62f58512e727a41d5efbc6066113be12a9da9621d0 SHA512 8193375b89cd6fbc8b00de195797099c128fcf5cb73757bbc57d3c5350c497a878eaf0200f2e0711bf062e25c5d170e05b055c63f85b908b18dcc89572d71fd2
 DIST ut2004megapack-linux.tar.bz2 203124107 BLAKE2B 1459e2638181411446ec5679bceb44023382b3533951478ee06c274199688f3bbe341d7f7806299a332373791b6d0a9e1b57efdc6a13a5983220e0adbc413118 SHA512 4ae5eec0622c2bd96dfc162541bc0771399b012fb00f022282bc8c34600cb8e9bb7c18a52dd55fbef6f16fedaf225e301c46077a6accd001f4c77ddad89ed17b
-EBUILD ut2004-bonuspack-ece-1-r3.ebuild 1754 BLAKE2B c9e1b4c1f06416739670ef7d2af8a3ab5c57d5fa970a4f103f3fa5c4e570a5a85687c268c63d5cf679ba40bfc2036ffc7ba77d66b203eab17f5e69514d6d9278 SHA512 4136dd65c99555dd1bb859e79d4000db11d22e47f7d0846fff15b696a7e282b840dac973352815e85c4c14a4ca43d3cbae0e1eddc21f842cb25d67d960329fa6
+EBUILD ut2004-bonuspack-ece-1-r4.ebuild 1922 BLAKE2B a2d5acc3ab09cbfc48fbe4f51ae8140b6949950a6e539c5145600c043e8286030696a6c3b6b6fc766875f17663665299affbfce018fc28ed2d3eac033f32f94d SHA512 22407966f82c6601872e57e749bde3813219d6822e2b24323af8a3ee4ee2bf8d03733ae7a3e035aa77dd0bea04425a3a8fc936e25b72832e6093c46f174ff498
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004-bonuspack-ece/ut2004-bonuspack-ece-1-r3.ebuild b/games-fps/ut2004-bonuspack-ece/ut2004-bonuspack-ece-1-r4.ebuild
index e5ebe2ab3b90..5460ac93230a 100644
--- a/games-fps/ut2004-bonuspack-ece/ut2004-bonuspack-ece-1-r3.ebuild
+++ b/games-fps/ut2004-bonuspack-ece/ut2004-bonuspack-ece-1-r4.ebuild
@@ -1,29 +1,34 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-MOD_DESC="Editor's Choice Edition bonus pack"
-MOD_NAME="Editor's Choice Edition"
-
-inherit games games-mods
+EAPI=7
 
 MY_P="ut2004megapack-linux.tar.bz2"
+
+DESCRIPTION="UT2004 Editor's Choice Edition - Editor's Choice Edition bonus pack"
 HOMEPAGE="http://www.unrealtournament2004.com/"
-SRC_URI="http://ut2004.ut-files.com/BonusPacks/${MY_P}
+SRC_URI="
+	http://ut2004.ut-files.com/BonusPacks/${MY_P}
 	http://unrealmassdestruction.com/downloads/ut2k4/essentials/UT2004-ONSBonusMapPack.zip"
 
 LICENSE="ut2003"
+SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
 
 src_unpack() {
-	unpack ${MY_P}
+	unpack "${MY_P}"
+
 	cd UT2004MegaPack/Maps || die
 	unpack UT2004-ONSBonusMapPack.zip # bug #278002
 }
 
 src_prepare() {
+	default
+
 	mv -f UT2004MegaPack/* . || die
 	rmdir UT2004MegaPack || die
 
@@ -54,3 +59,10 @@ src_prepare() {
 	rm System/{Core.int,Engine.int,Setup.int,Window.int} || die
 	rm System/{OnslaughtFull.u,OnslaughtBP.u} || die
 }
+
+src_install() {
+	insinto /opt/ut2004
+	doins -r Animations Help Maps Sounds StaticMeshes System Textures
+
+	dosym ut2004 /opt/ut2004-ded
+}
diff --git a/games-fps/ut2004-bonuspack-mega/Manifest b/games-fps/ut2004-bonuspack-mega/Manifest
index f525e2204f0a..4a9164ef1f24 100644
--- a/games-fps/ut2004-bonuspack-mega/Manifest
+++ b/games-fps/ut2004-bonuspack-mega/Manifest
@@ -1,3 +1,3 @@
 DIST ut2004megapack-linux.tar.bz2 203124107 BLAKE2B 1459e2638181411446ec5679bceb44023382b3533951478ee06c274199688f3bbe341d7f7806299a332373791b6d0a9e1b57efdc6a13a5983220e0adbc413118 SHA512 4ae5eec0622c2bd96dfc162541bc0771399b012fb00f022282bc8c34600cb8e9bb7c18a52dd55fbef6f16fedaf225e301c46077a6accd001f4c77ddad89ed17b
-EBUILD ut2004-bonuspack-mega-1-r2.ebuild 1156 BLAKE2B bac0ef4f8854377b0b6989d1150a814ad7d60a00701c493c502140bd1ed8ebe6156f1ff0878c346016922b6f823abe13ffb0ae760c065c49d4595f7cec8854bf SHA512 6aeb92058fe6a534f1ab5c688f4c8e3c14baa166dad5356944fe4cb39e29e4bedd4792799e040eacad9dffae4d6e7c5919452fbaa0b5c6cbc91a72c6030861d5
+EBUILD ut2004-bonuspack-mega-1-r3.ebuild 1375 BLAKE2B 11b92ca7bc864e6c196387df7c95b9faae0111b10baf68cd82441f7bf8c3273762a3417254db4d1eeff723d9896a89836c7c710674cc0e7c55b0e95f48c841dc SHA512 8cbc790da61fa8ee378922bab6e67774e793735b8bc2accdf28fe7eabb2577b1ace2cc40a52c465929b207b8e997b066debe7ece8625060fdc17320339c46d2f
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004-bonuspack-mega/ut2004-bonuspack-mega-1-r2.ebuild b/games-fps/ut2004-bonuspack-mega/ut2004-bonuspack-mega-1-r2.ebuild
deleted file mode 100644
index 807f91c6bf04..000000000000
--- a/games-fps/ut2004-bonuspack-mega/ut2004-bonuspack-mega-1-r2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MOD_DESC="Megapack bonus pack"
-MOD_NAME="Megapack"
-
-inherit games games-mods
-
-MY_P="ut2004megapack-linux.tar.bz2"
-HOMEPAGE="http://www.unrealtournament2004.com/"
-SRC_URI="http://ut2004.ut-files.com/BonusPacks/${MY_P}"
-
-LICENSE="ut2003"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_prepare() {
-	mv -f UT2004MegaPack/* . || die
-	rmdir UT2004MegaPack
-
-	# Remove files in Megapack which are already installed
-	rm -r Animations Speech Web
-
-	rm Help/{ReadMePatch.int.txt,UT2004Logo.bmp}
-	mv Help/BonusPackReadme.txt Help/MegapackReadme.txt
-
-	rm Maps/ONS-{Adara,IslandHop,Tricky,Urban}.ut2
-	rm Sounds/{CicadaSnds,DistantBooms,ONSBPSounds}.uax
-	rm StaticMeshes/{BenMesh02,BenTropicalSM01,HourAdara,ONS-BPJW1,PC_UrbanStatic}.usx
-
-	# System
-	rm System/{AL,AS-,B,b,C,D,E,F,G,I,L,O,o,S,s,U,V,W,X,x}*
-	rm System/{ucc,ut2004}-bin
-	rm System/{ucc,ut2004}-bin-linux-amd64
-	rm Textures/{AW-2k4XP,BenTex02,BenTropical01,BonusParticles,CicadaTex,Construction_S,HourAdaraTexor,jwfasterfiles,ONSBP_DestroyedVehicles,ONSBPTextures,PC_UrbanTex,UT2004ECEPlayerSkins}.utx
-}
diff --git a/games-fps/ut2004-bonuspack-mega/ut2004-bonuspack-mega-1-r3.ebuild b/games-fps/ut2004-bonuspack-mega/ut2004-bonuspack-mega-1-r3.ebuild
new file mode 100644
index 000000000000..4beb21b3c8aa
--- /dev/null
+++ b/games-fps/ut2004-bonuspack-mega/ut2004-bonuspack-mega-1-r3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="UT2004 Megapack - Megapack bonus pack"
+HOMEPAGE="http://www.unrealtournament2004.com/"
+SRC_URI="http://ut2004.ut-files.com/BonusPacks/ut2004megapack-linux.tar.bz2"
+
+LICENSE="ut2003"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	default
+
+	mv -f UT2004MegaPack/* . || die
+	rmdir UT2004MegaPack || die
+
+	# Remove files in Megapack which are already installed
+	rm -r Animations Speech Web || die
+
+	rm Help/{ReadMePatch.int.txt,UT2004Logo.bmp} || die
+	mv Help/BonusPackReadme.txt Help/MegapackReadme.txt || die
+
+	rm Maps/ONS-{Adara,IslandHop,Tricky,Urban}.ut2 || die
+	rm Sounds/{CicadaSnds,DistantBooms,ONSBPSounds}.uax || die
+	rm StaticMeshes/{BenMesh02,BenTropicalSM01,HourAdara,ONS-BPJW1,PC_UrbanStatic}.usx || die
+
+	# System
+	rm System/{AL,AS-,B,b,C,D,E,F,G,I,L,O,o,S,s,U,V,W,X,x}* || die
+	rm System/{ucc,ut2004}-bin || die
+	rm System/{ucc,ut2004}-bin-linux-amd64 || die
+	rm Textures/{AW-2k4XP,BenTex02,BenTropical01,BonusParticles,CicadaTex,Construction_S,HourAdaraTexor,jwfasterfiles,ONSBP_DestroyedVehicles,ONSBPTextures,PC_UrbanTex,UT2004ECEPlayerSkins}.utx || die
+}
+
+src_install() {
+	insinto /opt/ut2004
+	doins -r Help Maps Music Sounds StaticMeshes System Textures
+
+	dosym ut2004 /opt/ut2004-ded
+}
diff --git a/games-fps/ut2004-cor/Manifest b/games-fps/ut2004-cor/Manifest
deleted file mode 100644
index 67aaf112f834..000000000000
--- a/games-fps/ut2004-cor/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST cor_beta_v1.0.zip 278979612 BLAKE2B 39cc74b36bb8b752d6390c320077f5c6fa43de835fa490cad7156a57e2c5406f6ba2f15d8991a4bcb5605e5c722d221a093c11df1d47455568a804ab3d34df0d SHA512 04a8db1b31478785052d162e2007eb336d1d99c76f96098163c71616d3951e4e3c7b95c1b29a05e9acf2e0554c5bd20e5e2df10b93325b0e2cabf3a5a60640a6
-DIST cor_patch_b1_to_b101.zip 20386490 BLAKE2B 03091a14d15d749e33d92e5fa98a46b5a4d0c3fef83ab84869da490cff8395bef7bfabe42903271cb91324ad3931461d9f3080a267c0c2ea0c03faf692991471 SHA512 7b7243727a0e4570545f9d3f93a141b61da5e4cbe458894602925733396b3f9037c7a9a21a1ee9c9638181b4c321a9030a29837e1e808826a70bb52f54e2d6a6
-EBUILD ut2004-cor-1.01-r1.ebuild 560 BLAKE2B c9d72ca7375d8e7498b4f98c287d61a389e571601d7c8023dfa487e430ed8ec7578c20208c63d367739d70eaaa455b334a282f88e92712fc9b76f851793175b1 SHA512 e6cf39b4239ec7553385cab526bc92c8444488e410bb6966ada0148a5598d1bc4bc63b45cc4b938f56cd8856b39e9e7c389036d3427ed7ca9040c0485dc27167
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004-cor/metadata.xml b/games-fps/ut2004-cor/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/ut2004-cor/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/ut2004-cor/ut2004-cor-1.01-r1.ebuild b/games-fps/ut2004-cor/ut2004-cor-1.01-r1.ebuild
deleted file mode 100644
index 3cde6540eb44..000000000000
--- a/games-fps/ut2004-cor/ut2004-cor-1.01-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MOD_DESC="Shape-shifting robot teamplay mod"
-MOD_NAME="Counter Organic Revolution"
-MOD_DIR="COR"
-
-inherit games games-mods
-
-HOMEPAGE="https://www.moddb.com/mods/counter-organic-revolution"
-SRC_URI="https://ut.rushbase.net/beyondunreal/mods/cor_beta_v1.0.zip
-	https://ut.rushbase.net/beyondunreal/mods/cor_patch_b1_to_b101.zip"
-
-LICENSE="freedist"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated opengl"
-
-src_prepare() {
-	rm -f ${MOD_DIR}/*.bat || die
-}
diff --git a/games-fps/ut2004-crossfire/Manifest b/games-fps/ut2004-crossfire/Manifest
deleted file mode 100644
index 76897d013e26..000000000000
--- a/games-fps/ut2004-crossfire/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST TOCrossfire_beta_1.95_full.zip 1243833907 BLAKE2B ec6ce5ecec8357ed0a3b90eb7c64b25f372a37224454840bb2f55f0080d0f722fa4cd436d3299f11670627e7da1c46ad92ea6459cdbe734ed7d075117403b9e0 SHA512 a02c8221f7687e4a2276f6da9f9fc480b0c8aaf3f98517134614079699a0ecda088e781d5d0251b7da8588493afa394acc5eed99f40034d3555feeef6e175bbe
-EBUILD ut2004-crossfire-1.95.ebuild 699 BLAKE2B bca60fc8d3f2b8a938d72f6ca1d8ec7d4235fbca317d1ca138380ace55037c95443c874edcf46b24c1455990c1607cba9d646aabac4f8322ddddf30a0221204f SHA512 b1912616eb0e3feec1db88dc4d7a7b72d9dfcab6d91c9e880c7fa090f4eec6faa360e449f8d761edecc296c213ed0d034ede98493e256ff1d1b9fb4535081806
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004-crossfire/metadata.xml b/games-fps/ut2004-crossfire/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/ut2004-crossfire/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/ut2004-crossfire/ut2004-crossfire-1.95.ebuild b/games-fps/ut2004-crossfire/ut2004-crossfire-1.95.ebuild
deleted file mode 100644
index 52d8a5e9ed13..000000000000
--- a/games-fps/ut2004-crossfire/ut2004-crossfire-1.95.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MOD_NAME="Crossfire"
-MOD_DESC="Special Forces vs Terrorists"
-MOD_DIR="TOCrossfire"
-MOD_ICON="Help/icons/TOC_TERROR2.png"
-
-inherit games games-mods
-
-HOMEPAGE="http://to-crossfire.tnc-clan.de/"
-SRC_URI="ftp://files.tnc-clan.de/TOCrossfire/client/TOCrossfire_beta_${PV}_full.zip"
-
-# See Help/EULA.txt
-LICENSE="free-noncomm"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated opengl"
-
-src_unpack() {
-	unpack ${A}
-	unpack ./TOCinstall.tgz
-}
-
-src_prepare() {
-	rm -f *.{exe,reg,sh,tgz,txt} || die
-	rm -rf TOCInstaller.app stuff || die
-	cd ${MOD_DIR} || die
-	rm -f *.{bat,exe} Help/*.{exe,zip} || die
-}
diff --git a/games-fps/ut2004-data/Manifest b/games-fps/ut2004-data/Manifest
index ec4b009b4825..085b3461c508 100644
--- a/games-fps/ut2004-data/Manifest
+++ b/games-fps/ut2004-data/Manifest
@@ -1,2 +1,2 @@
-EBUILD ut2004-data-3186-r4.ebuild 12493 BLAKE2B 5a1aaf249c8e678108e2ce9d1600959498c2b2a08401d842d431a8ed2119a7ede486b402da582d2e4cca72f0e1eceb03034672c0b6132a14d7340a22f0ffee6d SHA512 68b5d2a24c5818235edc984c60de39a3a9b17bab304d1ecb601eab6db170f119c9a300756900700cde88c1e17ed103879d2db8982dfa2ec3ae0d83ea3e9a069e
+EBUILD ut2004-data-3186-r5.ebuild 13379 BLAKE2B 90e2f1479851b3eafc9baa1e72004bfdaab6f44b5da5dee7c3d99b5458def3d96e4953940fd8a7400598bec5780ec1503f95bc40d87710ce9a0f70a73c10f1fd SHA512 f6c81a3d419bd046612c26cec79bb3a4c4eba1353483ad3e6e4fd78e8650a537e4592fee041645dfd0d0d4b55eb4024d0766d4b76a7bbd4f172453b9333d0b18
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004-data/ut2004-data-3186-r4.ebuild b/games-fps/ut2004-data/ut2004-data-3186-r5.ebuild
index 7c761a8f9873..21e88f8ad6ac 100644
--- a/games-fps/ut2004-data/ut2004-data-3186-r4.ebuild
+++ b/games-fps/ut2004-data/ut2004-data-3186-r5.ebuild
@@ -1,25 +1,26 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils unpacker cdrom portability games
+EAPI=7
+
+inherit cdrom desktop eutils portability unpacker xdg-utils
 
 DESCRIPTION="Unreal Tournament 2004 - This is the data portion of UT2004"
-HOMEPAGE="http://www.unrealtournament2004.com/"
-SRC_URI=""
+HOMEPAGE="https://liandri.beyondunreal.com/Unreal_Tournament_2004"
 
 LICENSE="ut2003"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND="games-util/uz2unpack
-	>=app-arch/unshield-0.5-r1"
-PDEPEND="games-fps/ut2004"
+BDEPEND="
+	games-util/uz2unpack
+	>=app-arch/unshield-0.5-r1
+"
+
+PDEPEND=">=games-fps/ut2004-3369.3-r2"
+RDEPEND="!games-fps/ut2004-ded"
 
-S=${WORKDIR}
-dir=${GAMES_PREFIX_OPT}/ut2004
-Ddir=${D}/${dir}
+S="${WORKDIR}"
 
 check_dvd() {
 	# The following is a nasty mess to determine if we are installing from
@@ -64,17 +65,35 @@ grabdirs() {
 		# Is flexible to handle CD_ROOT vs CD_ROOT_1 mixups
 		[[ -d ${srcdir} ]] || srcdir=${CDROM_ROOT}/${d}
 		if [[ -d ${srcdir} ]] ; then
-			insinto "${dir}"
+			insinto /opt/ut2004
 			doins -r "${srcdir}"
 		fi
 	done
 }
 
-pkg_setup() {
-	games_pkg_setup
+ut_unpack() {
+	local ut_unpack="$1"
+	local f=
+
+	if [[ -z ${ut_unpack} ]] ; then
+		die "You must provide an argument to ut_unpack"
+	fi
+	if [[ -f ${ut_unpack} ]] ; then
+		uz2unpack "${ut_unpack}" "${ut_unpack%.uz2}" \
+			|| die "uncompressing file ${ut_unpack}"
+	fi
+	if [[ -d ${ut_unpack} ]] ; then
+		while read f ; do
+			uz2unpack "${ut_unpack}/${f}" "${ut_unpack}/${f%.uz2}" \
+				|| die "uncompressing file ${f}"
+			rm -f "${ut_unpack}/${f}" || die "deleting compressed file ${f}"
+		done < <(find "${ut_unpack}" -maxdepth 1 -name '*.uz2' -printf '%f\n' 2>/dev/null)
+	fi
+}
 
+pkg_setup() {
 	ewarn "This is a huge package. If you do not have at least 7GB of free"
-	ewarn "disk space in ${PORTAGE_TMPDIR} and also in ${GAMES_PREFIX_OPT}"
+	ewarn "disk space in ${PORTAGE_TMPDIR} and also in /opt"
 	ewarn "then you should abort this installation now and free up some space."
 }
 
@@ -136,15 +155,16 @@ src_unpack() {
 
 src_install() {
 	local j
+	local Ddir="${ED}"/opt/ut2004
 
 	if [[ ${USE_MIDWAY_DVD} -eq 1 ]] ; then
 		einfo "Copying files from UT2004 Midway DVD."
 
 		if [[ -f ${CDROM_ROOT}/Manual/Manual.pdf ]] ; then
-			insinto "${dir}"/Manual
+			insinto /opt/ut2004/Manual
 			doins "${CDROM_ROOT}"/Manual/Manual.pdf
 		elif [[ -f ${CDROM_ROOT}/Manual.pdf ]] ; then
-			insinto "${dir}"/Manual
+			insinto /opt/ut2004/Manual
 			doins "${CDROM_ROOT}"/Manual.pdf
 		fi
 
@@ -162,7 +182,7 @@ src_install() {
 
 		if [[ -d 4_UT2004_Animations ]] ; then
 			# Delete the other games on the Anthology DVD
-			rm -rf {1,2,3}_Unreal* 4_UT2004_EXE Launcher_* OCXFiles
+			rm -rf {1,2,3}_Unreal* 4_UT2004_EXE Launcher_* OCXFiles || die
 			# Rename directories to be same as Midway UT2004-only DVD,
 			# i.e. rename "4_UT2004_Animations" to "Animations".
 			for j in 4_UT2004_* ; do
@@ -171,8 +191,8 @@ src_install() {
 		fi
 
 		# The "logging" subdirectory is created by unshield.
-		rm -rf logging
-		rm -f *.{cab,hdr}
+		rm -rf logging || die
+		rm -f *.{cab,hdr} || die
 
 		for j in Animations Benchmark ForceFeedback Help KarmaData \
 			Manual Maps Music Sounds Speech StaticMeshes \
@@ -266,19 +286,19 @@ src_install() {
 
 		# The big install
 		einfo "Installing UT2004 directories..."
-		insinto "${dir}"
-		doins -r *
+		insinto /opt/ut2004
+		doins -r .
 	else
 		# Disk 1
 		einfo "Copying files from Disk 1..."
-		insinto "${dir}"
+		insinto /opt/ut2004
 		doins -r "${CDROM_ROOT}"/${DISK1}/{Animations,ForceFeedback,Help,KarmaData,Maps,Sounds,Web}
-		insinto "${dir}"/System
+		insinto /opt/ut2004/System
 		doins -r "${CDROM_ROOT}"/${DISK1}/System/{editorres,*.{bat,bmp,dat,det,est,frt,ini,int,itt,kot,md5,smt,tmt,u,ucl,upl,url}}
-		insinto "${dir}"/Manual
+		insinto /opt/ut2004/Manual
 		doins "${CDROM_ROOT}"/${DISK1}/Manual/Manual.pdf
-		insinto "${dir}"/Benchmark/Stuff
-		doins -r "${CDROM_ROOT}"/${DISK1}/Benchmark/Stuff/*
+		insinto /opt/ut2004/Benchmark/Stuff
+		doins -r "${CDROM_ROOT}"/${DISK1}/Benchmark/Stuff/.
 		cdrom_load_next_cd
 
 		local diskno
@@ -294,7 +314,7 @@ src_install() {
 		grabdirs "${DISK6}"
 
 		# Install extra help files
-		insinto "${dir}"/Help
+		insinto /opt/ut2004/Help
 		doins README.linux Unreal.bmp UT2004_EULA.txt ut2004.xpm
 
 		doicon ut2004.xpm
@@ -302,76 +322,76 @@ src_install() {
 		# Uncompress files
 		einfo "Uncompressing files... this *will* take a while..."
 		for j in Animations Maps Sounds StaticMeshes Textures ; do
-			fperms -R u+w "${dir}/${j}" || die
-			games_ut_unpack "${Ddir}"/${j}
+			fperms -R u+w /opt/ut2004/${j}
+			ut_unpack "${Ddir}"/${j}
 		done
 	fi
 
 	# Create empty files in Benchmark
 	for j in {CSVs,Logs,Results} ;do
-		keepdir "${dir}"/Benchmark/${j}
+		keepdir /opt/ut2004/Benchmark/${j}
 	done
 
-	make_wrapper ut2004 ./ut2004-bin "${dir}"/System "${dir}"/System "${dir}"
-
 	# Remove unneccessary files
-	rm -f "${Ddir}"/*.{bat,exe,EXE,int}
-	rm -f "${Ddir}"/Help/{.DS_Store,SAPI-EULA.txt}
-	rm -f "${Ddir}"/Manual/*.exe
-	rm -rf "${Ddir}"/Speech/Redist
-	rm -f "${Ddir}"/System/*.{bat,dll,exe,tar}
-	rm -f "${Ddir}"/System/{{License,Manifest}.smt,{ucc,StdOut}.log}
-	rm -f "${Ddir}"/System/{User,UT2004}.ini
+	rm -f "${Ddir}"/*.{bat,exe,EXE,int} || die
+	rm -f "${Ddir}"/Help/{.DS_Store,SAPI-EULA.txt} || die
+	rm -f "${Ddir}"/Manual/*.exe || die
+	rm -rf "${Ddir}"/Speech/Redist || die
+	rm -f "${Ddir}"/System/*.{bat,dll,exe,tar} || die
+	rm -f "${Ddir}"/System/{{License,Manifest}.smt,{ucc,StdOut}.log} || die
+	rm -f "${Ddir}"/System/{User,UT2004}.ini || die
 
 	# Remove file collisions with ut2004-3369-r4
-	rm -f "${Ddir}"/Animations/ONSNewTank-A.ukx
-	rm -f "${Ddir}"/Help/UT2004Logo.bmp
-	rm -f "${Ddir}"/System/{ALAudio.kot,AS-{Convoy,FallenCity,Glacier}.kot,AS-{Convoy,FallenCity,Glacier,Junkyard,Mothership,RobotFactory}.int,bonuspack.{det,est,frt},BonusPack.{int,itt,u},BR-Serenity.int}
-	rm -f "${Ddir}"/System/CTF-{AbsoluteZero,BridgeOfFate,DE-ElecFields,DoubleDammage,January,LostFaith}.int
-	rm -f "${Ddir}"/System/DM-{1on1-Albatross,1on1-Desolation,1on1-Mixer,Corrugation,IronDeity,JunkYard}.int
-	rm -f "${Ddir}"/System/{DOM-Atlantis.int,OnslaughtBP.{kot,u,ucl},OnslaughtFull.int}
-	rm -f "${Ddir}"/System/{Build.ini,CacheRecords.ucl,Core.{est,frt,kot,int,itt,u},CTF-January.kot,D3DDrv.kot,DM-1on1-Squader.kot}
-	rm -f "${Ddir}"/System/{Editor,Engine,Gameplay,GamePlay,UnrealGame,UT2k4Assault,XInterface,XPickups,xVoting,XVoting,XWeapons,XWebAdmin}.{det,est,frt,int,itt,u}
-	rm -f "${Ddir}"/System/{Fire.u,IpDrv.u,License.int,ONS-ArcticStronghold.kot}
-	rm -f "${Ddir}"/System/{OnslaughtFull,onslaughtfull,UT2k4AssaultFull}.{det,est,frt,itt,u}
-	rm -f "${Ddir}"/System/{GUI2K4,Onslaught,skaarjpack,SkaarjPack,XGame}.{det,est,frt,int,itt,kot,u}
-	rm -f "${Ddir}"/System/{Setup,Window}.{det,est,frt,int,itt,kot}
-	rm -f "${Ddir}"/System/XPlayers.{det,est,frt,int,itt}
-	rm -f "${Ddir}"/System/{UnrealEd.u,UTClassic.u,UTV2004c.u,UTV2004s.u,UWeb.u,Vehicles.kot,Vehicles.u,Xweapons.itt,UT2K4AssaultFull.int,UTV2004.kot,UTV2004s.kot}
-	rm -f "${Ddir}"/System/{XAdmin.kot,XAdmin.u,XMaps.det,XMaps.est}
-	rm -f "${Ddir}"/Textures/jwfasterfiles.utx
-	rm -f "${Ddir}"/Web/ServerAdmin/{admins_home.htm,current_bots.htm,ut2003.css,current_bots_species_group.inc}
-	rm -f "${Ddir}"/Web/ServerAdmin/ClassicUT/current_bots.htm
-	rm -f "${Ddir}"/Web/ServerAdmin/UnrealAdminPage/{adminsframe.htm,admins_home.htm,admins_menu.htm,current_bots.htm,currentframe.htm,current_menu.htm}
-	rm -f "${Ddir}"/Web/ServerAdmin/UnrealAdminPage/{defaultsframe.htm,defaults_menu.htm,footer.inc,mainmenu.htm,mainmenu_itemd.inc,rootframe.htm,UnrealAdminPage.css}
-	rm -f "${Ddir}"/Web/ServerAdmin/UT2K3Stats/{admins_home.htm,current_bots.htm,ut2003stats.css}
+	rm -f "${Ddir}"/Animations/ONSNewTank-A.ukx || die
+	rm -f "${Ddir}"/Help/UT2004Logo.bmp || die
+	rm -f "${Ddir}"/System/{ALAudio.kot,AS-{Convoy,FallenCity,Glacier}.kot,AS-{Convoy,FallenCity,Glacier,Junkyard,Mothership,RobotFactory}.int,bonuspack.{det,est,frt},BonusPack.{int,itt,u},BR-Serenity.int} || die
+	rm -f "${Ddir}"/System/CTF-{AbsoluteZero,BridgeOfFate,DE-ElecFields,DoubleDammage,January,LostFaith}.int || die
+	rm -f "${Ddir}"/System/DM-{1on1-Albatross,1on1-Desolation,1on1-Mixer,Corrugation,IronDeity,JunkYard}.int || die
+	rm -f "${Ddir}"/System/{DOM-Atlantis.int,OnslaughtBP.{kot,u,ucl},OnslaughtFull.int} || die
+	rm -f "${Ddir}"/System/{Build.ini,CacheRecords.ucl,Core.{est,frt,kot,int,itt,u},CTF-January.kot,D3DDrv.kot,DM-1on1-Squader.kot} || die
+	rm -f "${Ddir}"/System/{Editor,Engine,Gameplay,GamePlay,UnrealGame,UT2k4Assault,XInterface,XPickups,xVoting,XVoting,XWeapons,XWebAdmin}.{det,est,frt,int,itt,u} || die
+	rm -f "${Ddir}"/System/{Fire.u,IpDrv.u,License.int,ONS-ArcticStronghold.kot} || die
+	rm -f "${Ddir}"/System/{OnslaughtFull,onslaughtfull,UT2k4AssaultFull}.{det,est,frt,itt,u} || die
+	rm -f "${Ddir}"/System/{GUI2K4,Onslaught,skaarjpack,SkaarjPack,XGame}.{det,est,frt,int,itt,kot,u} || die
+	rm -f "${Ddir}"/System/{Setup,Window}.{det,est,frt,int,itt,kot} || die
+	rm -f "${Ddir}"/System/XPlayers.{det,est,frt,int,itt} || die
+	rm -f "${Ddir}"/System/{UnrealEd.u,UTClassic.u,UTV2004c.u,UTV2004s.u,UWeb.u,Vehicles.kot,Vehicles.u,Xweapons.itt,UT2K4AssaultFull.int,UTV2004.kot,UTV2004s.kot} || die
+	rm -f "${Ddir}"/System/{XAdmin.kot,XAdmin.u,XMaps.det,XMaps.est} || die
+	rm -f "${Ddir}"/Textures/jwfasterfiles.utx || die
+	rm -f "${Ddir}"/Web/ServerAdmin/{admins_home.htm,current_bots.htm,ut2003.css,current_bots_species_group.inc} || die
+	rm -f "${Ddir}"/Web/ServerAdmin/ClassicUT/current_bots.htm || die
+	rm -f "${Ddir}"/Web/ServerAdmin/UnrealAdminPage/{adminsframe.htm,admins_home.htm,admins_menu.htm,current_bots.htm,currentframe.htm,current_menu.htm} || die
+	rm -f "${Ddir}"/Web/ServerAdmin/UnrealAdminPage/{defaultsframe.htm,defaults_menu.htm,footer.inc,mainmenu.htm,mainmenu_itemd.inc,rootframe.htm,UnrealAdminPage.css} || die
+	rm -f "${Ddir}"/Web/ServerAdmin/UT2K3Stats/{admins_home.htm,current_bots.htm,ut2003stats.css} || die
 
 	# Remove file collisions with ut2004-bonuspack-ece
-	rm -f "${Ddir}"/Animations/{MechaSkaarjAnims,MetalGuardAnim,NecrisAnim,ONSBPAnimations}.ukx
-	rm -f "${Ddir}"/Help/BonusPackReadme.txt
-	rm -f "${Ddir}"/Maps/ONS-{Adara,IslandHop,Tricky,Urban}.ut2
-	rm -f "${Ddir}"/Sounds/{CicadaSnds,DistantBooms,ONSBPSounds}.uax
-	rm -f "${Ddir}"/StaticMeshes/{BenMesh02,BenTropicalSM01,HourAdara,ONS-BPJW1,PC_UrbanStatic}.usx
-	rm -f "${Ddir}"/System/{ONS-Adara.int,ONS-IslandHop.int,ONS-Tricky.int,ONS-Urban.int,OnslaughtBP.int,xaplayersl3.upl}
-	rm -f "${Ddir}"/Textures/{AW-2k4XP,BenTex02,BenTropical01,BonusParticles,CicadaTex,Construction_S}.utx
-	rm -f "${Ddir}"/Textures/{HourAdaraTexor,ONSBPTextures,ONSBP_DestroyedVehicles,PC_UrbanTex,UT2004ECEPlayerSkins}.utx
+	rm -f "${Ddir}"/Animations/{MechaSkaarjAnims,MetalGuardAnim,NecrisAnim,ONSBPAnimations}.ukx || die
+	rm -f "${Ddir}"/Help/BonusPackReadme.txt || die
+	rm -f "${Ddir}"/Maps/ONS-{Adara,IslandHop,Tricky,Urban}.ut2 || die
+	rm -f "${Ddir}"/Sounds/{CicadaSnds,DistantBooms,ONSBPSounds}.uax || die
+	rm -f "${Ddir}"/StaticMeshes/{BenMesh02,BenTropicalSM01,HourAdara,ONS-BPJW1,PC_UrbanStatic}.usx || die
+	rm -f "${Ddir}"/System/{ONS-Adara.int,ONS-IslandHop.int,ONS-Tricky.int,ONS-Urban.int,OnslaughtBP.int,xaplayersl3.upl} || die
+	rm -f "${Ddir}"/Textures/{AW-2k4XP,BenTex02,BenTropical01,BonusParticles,CicadaTex,Construction_S}.utx || die
+	rm -f "${Ddir}"/Textures/{HourAdaraTexor,ONSBPTextures,ONSBP_DestroyedVehicles,PC_UrbanTex,UT2004ECEPlayerSkins}.utx || die
 
 	# Remove file collisions with ut2004-bonuspack-mega
-	rm -f "${Ddir}"/Help/MegapackReadme.txt
-	rm -f "${Ddir}"/Maps/{AS-BP2-Acatana,AS-BP2-Jumpship,AS-BP2-Outback,AS-BP2-SubRosa,AS-BP2-Thrust}.ut2
-	rm -f "${Ddir}"/Maps/{CTF-BP2-Concentrate,CTF-BP2-Pistola,DM-BP2-Calandras,DM-BP2-GoopGod}.ut2
-	rm -f "${Ddir}"/Music/APubWithNoBeer.ogg
-	rm -f "${Ddir}"/Sounds/A_Announcer_BP2.uax
-	rm -f "${Ddir}"/StaticMeshes/{JumpShipObjects,Ty_RocketSMeshes}.usx
-	rm -f "${Ddir}"/System/{AssaultBP.u,Manifest.in{i,t},Packages.md5}
-	rm -f "${Ddir}"/Textures/{JumpShipTextures,T_Epic2k4BP2,Ty_RocketTextures}.utx
-
-	prepgamesdirs
+	rm -f "${Ddir}"/Help/MegapackReadme.txt || die
+	rm -f "${Ddir}"/Maps/{AS-BP2-Acatana,AS-BP2-Jumpship,AS-BP2-Outback,AS-BP2-SubRosa,AS-BP2-Thrust}.ut2 || die
+	rm -f "${Ddir}"/Maps/{CTF-BP2-Concentrate,CTF-BP2-Pistola,DM-BP2-Calandras,DM-BP2-GoopGod}.ut2 || die
+	rm -f "${Ddir}"/Music/APubWithNoBeer.ogg || die
+	rm -f "${Ddir}"/Sounds/A_Announcer_BP2.uax || die
+	rm -f "${Ddir}"/StaticMeshes/{JumpShipObjects,Ty_RocketSMeshes}.usx || die
+	rm -f "${Ddir}"/System/{AssaultBP.u,Manifest.in{i,t},Packages.md5} || die
+	rm -f "${Ddir}"/Textures/{JumpShipTextures,T_Epic2k4BP2,Ty_RocketTextures}.utx || die
 }
 
 pkg_postinst() {
-	games_pkg_postinst
+	xdg_icon_cache_update
 
 	elog "This is only the data portion of the game. To play UT2004,"
 	elog "you still need to install games-fps/ut2004."
 }
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/games-fps/ut2004-deathball/Manifest b/games-fps/ut2004-deathball/Manifest
deleted file mode 100644
index 7b209e2d629b..000000000000
--- a/games-fps/ut2004-deathball/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST deathball24w.zip 79276308 BLAKE2B 4e060e5f4f3dc8df7ee22b1c703531e5e1f97842aaf01fef9b87ef00895525f81cb1560cabdf5946fc8b7120c458557816857fba6e24f253da858133039d92b1 SHA512 b310c38dcc5889fc3f56861fe8d05e53c4b399b33e318614bfeb86b899051c8870b23bc39a82eda7eb7d469d7d2d32c361df922bcba18f01d03aa66239b133bc
-EBUILD ut2004-deathball-2.4w.ebuild 528 BLAKE2B 1e455b5cb36b8546c5dc79dbc56cb9cd849474c01197d7c46822198688e84ac0917953048f8e009943c7955dec66e7e01d237147e720bbb74bc0aed55e767854 SHA512 f2f455aeb238441e1387d12f275b5b5bca24118cc698946fb7888796b75acd42d1e4b4128f34719d2e444a03048fac3f025a8027c68478eb940ed9a05e07d0fe
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004-deathball/metadata.xml b/games-fps/ut2004-deathball/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/ut2004-deathball/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/ut2004-deathball/ut2004-deathball-2.4w.ebuild b/games-fps/ut2004-deathball/ut2004-deathball-2.4w.ebuild
deleted file mode 100644
index bd51db1c6c89..000000000000
--- a/games-fps/ut2004-deathball/ut2004-deathball-2.4w.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MOD_DESC="Fast-paced first person sport mod"
-MOD_NAME="Deathball"
-MOD_DIR="deathball"
-MOD_ICON="dbicon.ico"
-
-inherit games games-mods
-
-HOMEPAGE="http://www.deathball.net/"
-SRC_URI="http://www.deathball.net/downloads/deathball${PV/.}.zip"
-
-LICENSE="freedist"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated opengl"
-
-src_prepare() {
-	cd ${MOD_DIR} || die
-	mv -f ../*.txt . || die
-	rm -f *.bat *.cmd *.db Help/*.db || die
-}
diff --git a/games-fps/ut2004-fragops/Manifest b/games-fps/ut2004-fragops/Manifest
deleted file mode 100644
index 852dd3fe5045..000000000000
--- a/games-fps/ut2004-fragops/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fragops_v220_fulllmw.zip 554114758 BLAKE2B a3cfb94b64e6bb114077a0c802bbafe7d374c943c9524fd52a5982ab46c7c5e2c9d72622ea79ad0058c15ee3aa5e27fe0bb5a74e9c88847f8477cf7890a1fdce SHA512 f2a0b1a8e035e038a5241053c30761f725003aba8c45c862348ab8a8895c2db056bab45e2a1791080dcf54234923d736bd7d7361bb38bb2b67ebf5e077fc83e5
-EBUILD ut2004-fragops-2.20.ebuild 478 BLAKE2B b34bd14552676b701491e74344a9bbc6d7484aaf8088ab79c50df7a089e6b3a8095b6c2cba60298ca60f28d3fcca1328b3e4bd38efbb11e0ae66540ff3fdb365 SHA512 f06e65496e4f76f3468149c9c17c7d5b60b1e968a8302d2aa40cce86f93bcd85fb89a50bfa257ba4e6144e95a36d845ba25cbefe81224e9b3fad6db52e1ec5c9
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004-fragops/metadata.xml b/games-fps/ut2004-fragops/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/ut2004-fragops/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/ut2004-fragops/ut2004-fragops-2.20.ebuild b/games-fps/ut2004-fragops/ut2004-fragops-2.20.ebuild
deleted file mode 100644
index c20d529387f3..000000000000
--- a/games-fps/ut2004-fragops/ut2004-fragops-2.20.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MOD_DESC="realism mod"
-MOD_NAME="Frag Ops"
-MOD_DIR="FragOps"
-MOD_ICON="Help/FragOps.ico"
-
-inherit games games-mods
-
-HOMEPAGE="https://www.moddb.com/mods/fragops"
-SRC_URI="https://ut.rushbase.net/beyondunreal/mods/fragops_v220_fulllmw.zip"
-
-LICENSE="freedist"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated opengl"
-
-src_prepare() {
-	rm -f *.TXT ${MOD_DIR}/*.bat || die
-}
diff --git a/games-fps/ut2004-hamsterbash/Manifest b/games-fps/ut2004-hamsterbash/Manifest
deleted file mode 100644
index 3c95773d43d4..000000000000
--- a/games-fps/ut2004-hamsterbash/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST HamsterBashFinal.zip 98608028 BLAKE2B f80aabf16768adfa511efd72d762e50fdf45e98286306dab861d1989405d32712d03631d53b3f959c033e4e9c491b3ff16825fb00f33f75bfbe697d1f22be65b SHA512 641a642ce08d5188045f9d015a92f0846ac22c65b7b047bb0096f216d7cb9d0a8074e5e11b01fc187b56fbdf2d5cbc0e5cd56c2eb3f40f744fbeadf291e08573
-EBUILD ut2004-hamsterbash-1.ebuild 611 BLAKE2B 12e6833264181b682319e206d69203976a9109dd79ac78c0932df414b71b5496cabcef24090c9d02fdcb09964444cc34abad65153c5ed7e94a15dfa770890268 SHA512 75ef748c2a375fcd0d2081ea4942279779268efa8a6f6bb9e1f10e8341bdce1c02fa43c9f90d71de9af67c308e128f87d8906cbf9609fb8987f20ee29dda12bb
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004-hamsterbash/metadata.xml b/games-fps/ut2004-hamsterbash/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/ut2004-hamsterbash/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/ut2004-hamsterbash/ut2004-hamsterbash-1.ebuild b/games-fps/ut2004-hamsterbash/ut2004-hamsterbash-1.ebuild
deleted file mode 100644
index 3f7a22485abe..000000000000
--- a/games-fps/ut2004-hamsterbash/ut2004-hamsterbash-1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MOD_DESC="Cute and violent hamster cage rampage mod"
-MOD_NAME="Hamster Bash"
-MOD_DIR="hamsterbash"
-
-inherit unpacker games games-mods
-
-HOMEPAGE="https://www.moddb.com/mods/hamsterbash"
-SRC_URI="HamsterBashFinal.zip"
-
-LICENSE="freedist"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated opengl"
-RESTRICT="fetch"
-
-pkg_nofetch() {
-	elog "Please download ${SRC_URI} from:"
-	elog "${HOMEPAGE}"
-	elog "and move it to your DISTDIR directory."
-}
-
-src_prepare() {
-	mv -f HamsterBash ${MOD_DIR} || die
-	rm -rf System
-}
diff --git a/games-fps/ut2004-muralis/Manifest b/games-fps/ut2004-muralis/Manifest
deleted file mode 100644
index d17b08ef7865..000000000000
--- a/games-fps/ut2004-muralis/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST muralis-v1.15-zip.zip 62575050 BLAKE2B e168053472e63507667707295b3bfee261f802017cdd82e3b35b33855747fa19b75c4861f991b7678861cf8bfe84ea00ce697d979cd19c297c05c06b1c87d910 SHA512 b50477e3ef221241a430f95a390e34d5ffee3ea460e62bafa30b534d6499ef1a616d8ca35f77179e8f7a50b5e69f82441cb9779d38e71388c2868add45822330
-EBUILD ut2004-muralis-1.15.ebuild 489 BLAKE2B 2e483fe134a76c22546c53209786eaca5db34733ac57cafeb963aff512b4a34a73c92b4fd2874a1e18c31b2d81308f45e5c0888443902ecbe34e415f175d82f9 SHA512 14476b7cf20ba34492a1084388a63d8010bb78dabc84ea087e35cd418334510aa0d459c7ef611497744d90cd662d714f45d938a089d9cf25cc181ed8d142f845
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004-muralis/metadata.xml b/games-fps/ut2004-muralis/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/ut2004-muralis/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/ut2004-muralis/ut2004-muralis-1.15.ebuild b/games-fps/ut2004-muralis/ut2004-muralis-1.15.ebuild
deleted file mode 100644
index 70fe77742c3c..000000000000
--- a/games-fps/ut2004-muralis/ut2004-muralis-1.15.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MOD_DESC="third-person hand-to-hand single/multiplayer mod"
-MOD_NAME="Muralis"
-MOD_DIR="muralis"
-
-inherit unpacker games games-mods
-
-HOMEPAGE="https://www.moddb.com/mods/muralis"
-SRC_URI="https://ut.rushbase.net/beyondunreal/mods/muralis-v${PV}-zip.zip"
-
-LICENSE="freedist"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated opengl"
-
-src_prepare() {
-	mv -f Muralis ${MOD_DIR} || die
-}
diff --git a/games-fps/ut2004-strikeforce/Manifest b/games-fps/ut2004-strikeforce/Manifest
deleted file mode 100644
index f1630ab367c5..000000000000
--- a/games-fps/ut2004-strikeforce/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST strikeforce-ce-v4.1.zip 452020366 BLAKE2B de157150409c0be828241c06eab56cd75af777dd52eecf0c0aefa47970a693606428cef84d1c6e6f85730f6e95b1c165cb56cf2801ca926888d308ff0309b68b SHA512 758de1fa2a39b822114b7f224668acdbeffba6d62cc1b1a31104fcac4f84b6859cfa9a024d4d682682cf4f52de7118c1cbaa080a4887c6d882c0c7fb78ef3b49
-EBUILD ut2004-strikeforce-4.1.ebuild 477 BLAKE2B 96d6bcd20032d56429dbfaa05b3753faa2b84eea34f38cb049e223baf4d1c04aed25087b7a4e828ac665b583c3ef4676d3c9073af7d0fdb332426626b893e3b9 SHA512 415ff6790b094c038548a7d2425ec6ddfc1f5cc63c26c2f5e9771926fb5b9feb2e37522909c8d8c8ef26df03c568a0e8bdee8b116d6fdbf994ee0b45c2304c34
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004-strikeforce/metadata.xml b/games-fps/ut2004-strikeforce/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/ut2004-strikeforce/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/ut2004-strikeforce/ut2004-strikeforce-4.1.ebuild b/games-fps/ut2004-strikeforce/ut2004-strikeforce-4.1.ebuild
deleted file mode 100644
index d29a723f4f68..000000000000
--- a/games-fps/ut2004-strikeforce/ut2004-strikeforce-4.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MOD_DESC="a terrorist vs. strike force mod"
-MOD_NAME="Strike Force"
-MOD_DIR="StrikeForce"
-
-inherit games games-mods
-
-HOMEPAGE="https://www.moddb.com/mods/strike-force-2004"
-SRC_URI="https://ut.rushbase.net/beyondunreal/mods/strikeforce-ce-v${PV}.zip"
-
-LICENSE="freedist"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated opengl"
-
-src_prepare() {
-	rm -f ${MOD_DIR}/*.exe
-}
diff --git a/games-fps/ut2004-troopers/Manifest b/games-fps/ut2004-troopers/Manifest
deleted file mode 100644
index 4a3dc9c9a767..000000000000
--- a/games-fps/ut2004-troopers/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST troopersversion60zip.zip 447383148 BLAKE2B 4eed868b0a8631529f0e09227d45db4f0a89ff7088cec2c03c263323aa9385f204561b278a9e6c408db6d972e773e2c3d3cbc7dff64ba0cd04fc603ce541d297 SHA512 2eec66a55b0733f2f5ee65e8a4deb329a50bcd47aa6fdcb7252a88c01e4e8db563b568d3176233a51711240e7b4dfebe0d8a8712d624915a872e8bfeb321cda4
-EBUILD ut2004-troopers-6.0.ebuild 595 BLAKE2B a68dec0dd757db52f8205596a9b94513f44d99a6f135e926f66a8f4fc9bc59e291cad703fe88382069edc4680edc0de68acaac4566ef747c198cf946f6f4c060 SHA512 0762115cb6090e881373abd13e2b082a16244a3a022d9b32755b5c752381def07464513df4cfb73d0b80fe36a98ca2bf10eb10a2e91552b4eab515d92f0a1599
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004-troopers/metadata.xml b/games-fps/ut2004-troopers/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/ut2004-troopers/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/ut2004-troopers/ut2004-troopers-6.0.ebuild b/games-fps/ut2004-troopers/ut2004-troopers-6.0.ebuild
deleted file mode 100644
index 780b96390e05..000000000000
--- a/games-fps/ut2004-troopers/ut2004-troopers-6.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MOD_DESC="Star Wars mod"
-MOD_NAME="Troopers"
-MOD_DIR="Troopers"
-MOD_ICON="Help/Troopers.ico"
-
-inherit games games-mods
-
-HOMEPAGE="https://www.moddb.com/mods/troopers-dawn-of-destiny/"
-SRC_URI="troopersversion${PV/.}zip.zip"
-
-LICENSE="freedist"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated opengl"
-RESTRICT="fetch"
-
-pkg_nofetch() {
-	elog "Please download ${SRC_URI} from:"
-	elog "${HOMEPAGE}"
-	elog "and move it to your DISTDIR directory."
-}
-
-src_prepare() {
-	rm -f ${MOD_DIR}/*.{bat,sh}
-}
diff --git a/games-fps/ut2004-unwheel/Manifest b/games-fps/ut2004-unwheel/Manifest
deleted file mode 100644
index 6b03cc02c4e1..000000000000
--- a/games-fps/ut2004-unwheel/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST unwheel_r5.zip 596390232 BLAKE2B 583b89cd10962e09084f66d85ba437cc336fc3818a9af1cab30d553dc213efa23f88692d555842dbf5c5a7fc27fe607066695163503131d4cadff548d1bb5f91 SHA512 4cf319b1e20c9faa5e248e3a39a015b9a37d6defe4a8f31d634931a426dec957a1330d559d45333fda9a2451f9f3a0f7161d94c101d46950f6921fcfc0d87ee3
-DIST unwheelcbpvol1.zip 138178365 BLAKE2B 25f3f61803c63e7cf6f5e4dd7da29ff9c3d90481677416bcb10cc3fae26db5aa6b0065fe945e46b632852b6e9853a7263f97bfc6de2a2a8b13067d1e917d12b4 SHA512 0cb1c3a64d8cd4448ebdfde175a25afa253336102831fa8a2abc113064cca4a0afbe90e806b4c1d1fa898142496070349566e2bcf5aad42ba12dec2c947e6fcc
-EBUILD ut2004-unwheel-0_beta5.ebuild 694 BLAKE2B 7bf9226398e42dc40b85375c0e632a0230af0b9f25d5e4826edf070bd5187afe7849bc30d30f644deecc7da84bb6786c05c3cd379a19a19cfff4ffd7a1c28b87 SHA512 621a899ace11550ee6523cc12f857366efe30b26b3afb085a1a2b809bf9acd913d90b810c1e42dd7417c4682154bc0327d8518956c30a1371a7954807d41d592
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004-unwheel/metadata.xml b/games-fps/ut2004-unwheel/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/ut2004-unwheel/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/ut2004-unwheel/ut2004-unwheel-0_beta5.ebuild b/games-fps/ut2004-unwheel/ut2004-unwheel-0_beta5.ebuild
deleted file mode 100644
index 497dc9518b13..000000000000
--- a/games-fps/ut2004-unwheel/ut2004-unwheel-0_beta5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MOD_DESC="multiplayer driving mod focusing on fun driving"
-MOD_NAME="UnWheel"
-MOD_DIR="unwheel"
-
-inherit games games-mods
-
-HOMEPAGE="https://www.moddb.com/mods/unwheel"
-SRC_URI="unwheel_r5.zip
-	unwheelcbpvol1.zip"
-
-LICENSE="GameFront"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated opengl"
-RESTRICT="fetch bindist"
-
-pkg_nofetch() {
-	elog "Please download the following files:"
-	elog "http://www.filefront.com/5110896"
-	elog "http://www.filefront.com/13792114"
-	elog "and move them to your DISTDIR directory."
-}
-
-src_unpack() {
-	mkdir ${MOD_DIR} || die
-	cd ${MOD_DIR} || die
-	unpack ${A}
-}
diff --git a/games-fps/ut2004/Manifest b/games-fps/ut2004/Manifest
index 03d6b8dda77f..4de8f70355bc 100644
--- a/games-fps/ut2004/Manifest
+++ b/games-fps/ut2004/Manifest
@@ -1,4 +1,6 @@
+AUX ut2004-ded.confd 175 BLAKE2B 7384ec15a4dd1ea03ddf06068032a69d32a8bfb7536bbfc5ea91ef369ee2668c1f3c9c66d249d6b24dec60dfe22fe4a91522e5a6958e75df568d132f062eb6d8 SHA512 96bf28c03faf04736f9447e3e6c549e5ec77e477683f805847b53f0ae2b5280863876fd49c787d63d4f3d2019b9379d3fa4573c32f4ebf3be636b0a272321a93
+AUX ut2004-ded.initd 320 BLAKE2B 34e3fdf38eb9e5bc2623581c73fea3af040f9dca829c8c46d649b5124472989931278a93c5a2a52acc2faf7c53df74dfaf772a35e52d127b357097070e3c3c12 SHA512 a307105dc110ec1009eabfe61777b33ad89c9e22cebc199ab7e990e9b170b97ab8e176865e62ebed40f4a80f7e5ddee6f248a1e73f25bac1a61c32f0c90a126d
 DIST ut2004-lnxpatch3369-2.tar.bz2 22465217 BLAKE2B 9852f9d55804b7f2927a31be86aee1552aaebeb38d2a40fb206154c236e9d6eff47f7594024c0d9b25c7216d3ca62571b1f89f23f72ee9e135b2e6451bcb006a SHA512 0d6f26d5a811efd64be8c304e928e03f546d9a8eaba6b074843e2b7e76e0670b39df95200a2fe2040d72bbd204c7157ed0115649a5c85396a76d9e0b7ec284b1
 DIST ut2004-v3369-3-linux-dedicated.7z 5013927 BLAKE2B 72d24d7bc37c777f3697b767a03e052ad9b547005dd6da73833e439496e87a9c1ebbe01f88d62b29a41b2bf6380a3b3bd745e6883fbb6d0f2b7e52998d4af276 SHA512 3b2a7b64934a3647c02c9fec48565c5c2c35370d635b2af4059eb76587bfa13f46e6a4e14fdb0494ba7a4182497ed5963601986f4fcfa318e69a8a8a8c0178cf
-EBUILD ut2004-3369.3-r1.ebuild 3952 BLAKE2B 36a6f69cd43754cfc961ea72916c8cdcdb7f9e21410d8e2f0180a0594f67982f4e91bc518a049d3f47fa3a880304f091bbfb7c74bcb9c69ab0d85ebb5198fcd8 SHA512 b14f5efb5d101948d049122a663df3dadec37bf2a05475427a145fe3eb483ba272e8f07505ec0e5342997b0c0d7bb8f1f51affb4971100ccea4866b5e92261a8
+EBUILD ut2004-3369.3-r2.ebuild 3593 BLAKE2B 97af1ebfaa24333d94348b7c31ca8f8cf99852fb0256abd417ccdb65e828efd657662f2a18d62c74177c41eaf3a6d241d109e4deef4b1063a64d36d12c5c8859 SHA512 c41289fd46d31382804251be538031c024cf4c64aa80f4b196fbffe7549879a5c9f77753ef88183852791a8a860c65cb3743ecfb5a4f4a45171d0fe9a58c05ef
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004/files/ut2004-ded.confd b/games-fps/ut2004/files/ut2004-ded.confd
new file mode 100644
index 000000000000..e82238b93de0
--- /dev/null
+++ b/games-fps/ut2004/files/ut2004-ded.confd
@@ -0,0 +1,6 @@
+# User and group the server should run as.
+ut2004_ded_user="nobody"
+ut2004_ded_group="nobody"
+
+# Any extra options you want to pass to the server.
+ut2004_ded_opts="DM-Deck17"
diff --git a/games-fps/ut2004/files/ut2004-ded.initd b/games-fps/ut2004/files/ut2004-ded.initd
new file mode 100644
index 000000000000..c4cf9810cd15
--- /dev/null
+++ b/games-fps/ut2004/files/ut2004-ded.initd
@@ -0,0 +1,13 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+pidfile="/var/run/${RC_SVCNAME}.pid"
+command_background="true"
+command_user="${ut2004_ded_user}:${ut2004_ded_group}"
+command="ut2004-ded"
+command_args="${ut2004_ded_opts}"
+
+depend() {
+	need net
+}
diff --git a/games-fps/ut2004/ut2004-3369.3-r1.ebuild b/games-fps/ut2004/ut2004-3369.3-r1.ebuild
deleted file mode 100644
index 1daedb39a999..000000000000
--- a/games-fps/ut2004/ut2004-3369.3-r1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils multilib games
-
-MY_P="ut2004-lnxpatch${PV%.*}-2.tar.bz2"
-DESCRIPTION="Editor's Choice Edition plus Mega Pack for the well-known first-person shooter"
-HOMEPAGE="http://www.unrealtournament2004.com/"
-SRC_URI="
-	http://treefort.icculus.org/${PN}/${MY_P}
-	http://storage.guntoo.de/downs/downloads/Patch/ut2004-v${PV/./-}-linux-dedicated.7z
-	mirror://gentoo/ut2004-v${PV/./-}-linux-dedicated.7z"
-
-LICENSE="ut2003"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated opengl"
-RESTRICT="bindist mirror strip"
-
-UIDEPEND="=virtual/libstdc++-3.3
-	virtual/opengl
-	x11-libs/libXext
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	media-libs/libsdl
-	media-libs/openal"
-RDEPEND="sys-libs/glibc
-	games-fps/ut2004-data
-	games-fps/ut2004-bonuspack-ece
-	games-fps/ut2004-bonuspack-mega
-	dedicated? ( !games-server/ut2004-ded )
-	opengl? ( ${UIDEPEND} )
-	!dedicated? ( !opengl? ( ${UIDEPEND} ) )"
-DEPEND="app-arch/p7zip"
-
-S=${WORKDIR}/UT2004-Patch
-dir=${GAMES_PREFIX_OPT}/${PN}
-
-# The executable pages are required #114733
-QA_PREBUILT="${dir:1}/System/ut2004-bin
-	${dir:1}/System/ucc-bin"
-
-src_prepare() {
-	cd "${S}"/System
-
-	# These files are owned by ut2004-bonuspack-mega
-	rm -f Manifest.in{i,t} Packages.md5 ucc-bin* || die
-
-	if use amd64 ; then
-		mv -f ut2004-bin-linux-amd64 ut2004-bin || die
-	else
-		rm -f ut2004-bin-linux-amd64 || die
-	fi
-
-	cd "${WORKDIR}"/ut2004-ucc-bin-09192008
-	if use amd64 ; then
-		mv -f ucc-bin-linux-amd64 "${S}"/System/ucc-bin || die
-	else
-		mv -f ucc-bin "${S}"/System/ || die
-	fi
-
-	if use dedicated && ! use opengl ; then
-		rm -f "${S}"/System/ut2004-bin || die
-	fi
-}
-
-src_install() {
-	insinto "${dir}"
-	doins -r *
-	fperms +x "${dir}"/System/ucc-bin
-
-	if use opengl || ! use dedicated ; then
-		fperms +x "${dir}"/System/ut2004-bin
-
-		dosym /usr/$(get_libdir)/libopenal.so "${dir}"/System/openal.so
-		dosym /usr/$(get_libdir)/libSDL-1.2.so.0 "${dir}"/System/libSDL-1.2.so.0
-
-		games_make_wrapper ut2004 ./ut2004 "${dir}" "${dir}"
-		make_desktop_entry ut2004 "Unreal Tournament 2004"
-	fi
-
-	if use dedicated ; then
-		games_make_wrapper ut2004-ded "./ucc-bin server" "${dir}"/System
-	fi
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	# Here is where we check for the existence of a cdkey...
-	# If we don't find one, we ask the user for it
-	if [[ -f ${dir}/System/cdkey ]] ; then
-		einfo "A cdkey file is already present in ${dir}/System"
-	else
-		ewarn "You MUST run this before playing the game:"
-		ewarn "emerge --config =${CATEGORY}/${PF}"
-		ewarn "That way you can [re]enter your cdkey."
-	fi
-	elog "Starting with 3369, the game supports render-to-texture. To enable"
-	elog "it, you will need the Nvidia drivers of at least version 7676 and"
-	elog "you should edit the following:"
-	elog 'Set "UseRenderTargets=True" in the "[OpenGLDrv.OpenGLRenderDevice]"'
-	elog 'section of your UT2004.ini or Default.ini and set "bPlayerShadows=True"'
-	elog 'and "bBlobShadow=False" in the "[UnrealGame.UnrealPawn]" section of'
-	elog 'your User.ini or DefUser.ini.'
-}
-
-pkg_postrm() {
-	ewarn "This package leaves a cdkey file in ${dir}/System that you need"
-	ewarn "to remove to completely get rid of this game's files."
-}
-
-pkg_config() {
-	ewarn "Your CD key is NOT checked for validity here so"
-	ewarn "make sure you type it in correctly."
-	ewarn "If you CTRL+C out of this, the game will not run!"
-	echo
-	einfo "CD key format is: XXXXX-XXXXX-XXXXX-XXXXX"
-	while true ; do
-		einfo "Please enter your CD key:"
-		read CDKEY1
-		einfo "Please re-enter your CD key:"
-		read CDKEY2
-		if [[ -z ${CDKEY1} ]] || [[ -z ${CDKEY2} ]] ; then
-			echo "You entered a blank CD key. Try again."
-		else
-			if [[ ${CDKEY1} == ${CDKEY2} ]] ; then
-				echo "${CDKEY1}" | tr [:lower:] [:upper:] > "${dir}"/System/cdkey
-				einfo "Thank you!"
-				break
-			else
-				eerror "Your CD key entries do not match. Try again."
-			fi
-		fi
-	done
-}
diff --git a/games-fps/ut2004/ut2004-3369.3-r2.ebuild b/games-fps/ut2004/ut2004-3369.3-r2.ebuild
new file mode 100644
index 000000000000..77ba2877605a
--- /dev/null
+++ b/games-fps/ut2004/ut2004-3369.3-r2.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop eutils
+
+PATCH_P="${PN}-lnxpatch${PV%.*}-2.tar.bz2"
+DESCRIPTION="Editor's Choice Edition plus Mega Pack for the well-known first-person shooter"
+HOMEPAGE="https://liandri.beyondunreal.com/Unreal_Tournament_2004"
+SRC_URI="
+	https://ut2004.ut-files.com/Patches/Linux/${PATCH_P}
+	https://dev.gentoo.org/~chewi/distfiles/ut2004-v${PV/./-}-linux-dedicated.7z
+"
+
+LICENSE="ut2003"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	!games-server/ut2004-ded
+	games-fps/ut2004-bonuspack-ece
+	games-fps/ut2004-bonuspack-mega
+	>=games-fps/ut2004-data-3186-r5
+	media-libs/libsdl
+	media-libs/openal
+	sys-libs/glibc
+	~virtual/libstdc++-3.3
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXext
+"
+
+BDEPEND="app-arch/p7zip"
+
+S="${WORKDIR}/${PN^^}-Patch"
+DIR="/opt/${PN}"
+
+# The executable pages are required. Bug #114733.
+QA_PREBUILT="*"
+
+src_prepare() {
+	default
+
+	if use amd64; then
+		mv System/${PN}-bin{-linux-amd64,} || die
+		mv ../${PN}-ucc-bin-09192008/ucc-bin-linux-amd64 System/ucc-bin || die
+	else
+		rm System/${PN}-bin-linux-amd64 || die
+		mv ../${PN}-ucc-bin-09192008/ucc-bin System/ucc-bin || die
+	fi
+
+	# In ut2004-bonuspack-mega.
+	rm System/{Manifest.in[it],Packages.md5} || die
+}
+
+src_install() {
+	insinto "${DIR}"
+	doins -r .
+	fperms +x "${DIR}"/System/{ucc,${PN}}-bin
+
+	dosym ../../../usr/$(get_libdir)/libopenal.so "${DIR}"/System/openal.so
+	dosym ../../../usr/$(get_libdir)/libSDL-1.2.so.0 "${DIR}"/System/libSDL-1.2.so.0
+
+	make_wrapper ${PN} ./${PN}-bin "${DIR}"/System "${DIR}"
+	make_wrapper ${PN}-ded "./ucc-bin server" "${DIR}"/System
+
+	make_desktop_entry ${PN} "Unreal Tournament 2004"
+
+	newconfd "${FILESDIR}"/${PN}-ded.confd ${PN}-ded
+	newinitd "${FILESDIR}"/${PN}-ded.initd ${PN}-ded
+}
+
+pkg_postinst() {
+	# Here is where we check for the existence of a cdkey.
+	# If we don't find one, we ask the user for it.
+	if [[ -f "${EROOT}${DIR}"/System/cdkey ]] ; then
+		einfo "A cdkey file is already present in ${EPREFIX}${DIR}/System"
+	else
+		ewarn "You MUST run this before playing the game:"
+		ewarn "emerge --config =${CATEGORY}/${PF}"
+		ewarn "That way you can [re]enter your cdkey."
+	fi
+	elog "Starting with 3369, the game supports render-to-texture. To enable"
+	elog "it, you will need the Nvidia drivers of at least version 7676 and"
+	elog "you should edit the following:"
+	elog 'Set "UseRenderTargets=True" in the "[OpenGLDrv.OpenGLRenderDevice]"'
+	elog 'section of your UT2004.ini or Default.ini and set "bPlayerShadows=True"'
+	elog 'and "bBlobShadow=False" in the "[UnrealGame.UnrealPawn]" section of'
+	elog 'your User.ini or DefUser.ini.'
+}
+
+pkg_postrm() {
+	ewarn "This package leaves a cdkey file in ${EROOT}${DIR}/System that you need"
+	ewarn "to remove to completely get rid of this game's files."
+}
+
+pkg_config() {
+	ewarn "Your CD key is NOT checked for validity here so"
+	ewarn "make sure you type it in correctly."
+	ewarn "If you CTRL+C out of this, the game will not run!"
+	ewarn
+	einfo "CD key format is: XXXXX-XXXXX-XXXXX-XXXXX"
+	while true ; do
+		einfo "Please enter your CD key:"
+		read CDKEY1
+		einfo "Please re-enter your CD key:"
+		read CDKEY2
+		if [[ -z ${CDKEY1} ]] || [[ -z ${CDKEY2} ]] ; then
+			echo "You entered a blank CD key. Try again."
+		else
+			if [[ ${CDKEY1} == ${CDKEY2} ]] ; then
+				echo "${CDKEY1^^}" > "${EROOT}${DIR}"/System/cdkey || die
+				einfo "Thank you!"
+				break
+			else
+				eerror "Your CD key entries do not match. Try again."
+			fi
+		fi
+	done
+}
author	V3n3RiX <venerix@redcorelinux.org>	2019-11-03 16:06:58 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-11-03 16:06:58 +0000
commit	bd4aeefe33e63f613512604e47bfca7b2187697d (patch)
tree	adb35b5a9a00ee7ea591ab0c987f70167c23b597 /games-fps
parent	48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff)