gentoo resync : 03.11.2019

32 files changed, 86 insertions, 266 deletions

diff --git a/metadata/md5-cache/games-fps/Manifest.gz b/metadata/md5-cache/games-fps/Manifest.gz
index cb29f125c3ff..9cf978657bbe 100644
--- a/metadata/md5-cache/games-fps/Manifest.gz
+++ b/metadata/md5-cache/games-fps/Manifest.gz
diff --git a/metadata/md5-cache/games-fps/doomsday-2.1.1 b/metadata/md5-cache/games-fps/doomsday-2.1.1
index 9234dffd3d7d..4b0edda7602e 100644
--- a/metadata/md5-cache/games-fps/doomsday-2.1.1
+++ b/metadata/md5-cache/games-fps/doomsday-2.1.1
@@ -11,5 +11,5 @@ PDEPEND=demo? ( games-fps/doom-data ) freedoom? ( games-fps/freedoom )
 RDEPEND=dev-qt/qtcore:5= dev-qt/qtgui:5=[-gles2] dev-qt/qtnetwork:5= dev-qt/qtopengl:5= dev-qt/qtwidgets:5= dev-qt/qtx11extras:5= media-libs/assimp net-misc/curl sys-libs/zlib fmod? ( media-libs/fmod:1 ) fluidsynth? ( media-sound/fluidsynth:= ) openal? ( media-libs/openal ) tools? ( sys-libs/ncurses:0= )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/deng/Doomsday%20Engine/2.1.1/doomsday-2.1.1.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c18154fb36c92e3ebca7b677689d1b2c
diff --git a/metadata/md5-cache/games-fps/eduke32-20190919.8133 b/metadata/md5-cache/games-fps/eduke32-20190919.8133-r1
index fa317f866782..790a267a590e 100644
--- a/metadata/md5-cache/games-fps/eduke32-20190919.8133
+++ b/metadata/md5-cache/games-fps/eduke32-20190919.8133-r1
@@ -1,15 +1,16 @@
+BDEPEND=app-arch/unzip x86? ( dev-lang/nasm )
 DEFINED_PHASES=compile install postinst postrm test unpack
-DEPEND=media-libs/libsdl2[joystick,opengl?,sound,video] media-libs/sdl2-mixer[flac?,fluidsynth?,midi,timidity?,vorbis?] sys-libs/zlib:= flac? ( media-libs/flac ) gtk? ( x11-libs/gtk+:2 ) opengl? ( virtual/glu virtual/opengl ) png? ( media-libs/libpng:0= ) timidity? ( media-sound/timidity-freepats ) vpx? ( media-libs/libvpx:= ) vorbis? ( media-libs/libogg media-libs/libvorbis ) xmp? ( media-libs/exempi:= ) app-arch/unzip x86? ( dev-lang/nasm )
+DEPEND=media-libs/libsdl2[joystick,opengl?,sound,video] media-libs/sdl2-mixer[flac?,fluidsynth?,midi,timidity?,vorbis?] sys-libs/zlib:= flac? ( media-libs/flac ) gtk? ( x11-libs/gtk+:2 ) opengl? ( virtual/glu virtual/opengl ) png? ( media-libs/libpng:0= ) vpx? ( media-libs/libvpx:= ) vorbis? ( media-libs/libogg media-libs/libvorbis ) xmp? ( media-libs/exempi:= ) cdinstall? ( games-fps/duke3d-data ) demo? ( games-fps/duke3d-demodata ) timidity? ( media-sound/timidity++ )
 DESCRIPTION=An open source engine port of the classic PC first person shooter Duke Nukem 3D
 EAPI=7
 HOMEPAGE=http://www.eduke32.com/
 IUSE=cdinstall demo flac fluidsynth gtk hrp offensive opengl opl png psx sc-55 server sdk timidity tools vorbis voxels vpx xmp
 KEYWORDS=~amd64 ~hppa ~x86
 LICENSE=BUILDLIC GPL-2 HRP
-RDEPEND=media-libs/libsdl2[joystick,opengl?,sound,video] media-libs/sdl2-mixer[flac?,fluidsynth?,midi,timidity?,vorbis?] sys-libs/zlib:= flac? ( media-libs/flac ) gtk? ( x11-libs/gtk+:2 ) opengl? ( virtual/glu virtual/opengl ) png? ( media-libs/libpng:0= ) timidity? ( media-sound/timidity-freepats ) vpx? ( media-libs/libvpx:= ) vorbis? ( media-libs/libogg media-libs/libvorbis ) xmp? ( media-libs/exempi:= ) cdinstall? ( games-fps/duke3d-data ) demo? ( games-fps/duke3d-demodata )
+RDEPEND=media-libs/libsdl2[joystick,opengl?,sound,video] media-libs/sdl2-mixer[flac?,fluidsynth?,midi,timidity?,vorbis?] sys-libs/zlib:= flac? ( media-libs/flac ) gtk? ( x11-libs/gtk+:2 ) opengl? ( virtual/glu virtual/opengl ) png? ( media-libs/libpng:0= ) vpx? ( media-libs/libvpx:= ) vorbis? ( media-libs/libogg media-libs/libvorbis ) xmp? ( media-libs/exempi:= )
 REQUIRED_USE=cdinstall? ( !demo ) demo? ( !cdinstall ) hrp? ( ^^ ( demo cdinstall ) !voxels ) offensive? ( ^^ ( demo cdinstall ) ) opl? ( ^^ ( demo cdinstall ) !sc-55 ) psx? ( ^^ ( demo cdinstall ) ) sc-55? ( ^^ ( demo cdinstall ) !opl ) voxels? ( !hrp ) vpx? ( opengl )
 RESTRICT=bindist
 SLOT=0
 SRC_URI=http://dukeworld.com/eduke32/synthesis/20190919-8133/eduke32_src_20190919-8133.tar.xz http://www.eduke32.com/images/eduke32_classic.png hrp? ( http://www.duke4.org/files/nightfright/hrp/duke3d_hrp.zip -> duke3d_hrp-5.4.zip ) offensive? ( http://www.duke4.org/files/nightfright/related/duke3d_xxx.zip -> duke3d_xxx-1.33.zip ) opl? ( http://www.moddb.com/downloads/mirror/95750/102/ce9e8f422c6cccdb297852426e96740a -> duke3d_musopl-2.01.zip ) psx? ( http://www.duke4.org/files/nightfright/related/duke3d_psx.zip -> duke3d_psx-1.11.zip ) sc-55? ( http://www.duke4.org/files/nightfright/music/duke3d_music-sc55.zip -> duke3d_music-sc55-4.02.zip ) voxels? ( https://www.dropbox.com/s/yaxfahyvskyvt4r/duke3d_voxels.zip -> duke3d_voxels-1.21.zip )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1412ab72327f9dd9eafed953a906de98
+_md5_=ecb6edc1d501c8bbbbb50be967b59aaf
diff --git a/metadata/md5-cache/games-fps/enemy-territory-etpro-3.2.6-r1 b/metadata/md5-cache/games-fps/enemy-territory-etpro-3.2.6-r1
deleted file mode 100644
index f0722d556fa9..000000000000
--- a/metadata/md5-cache/games-fps/enemy-territory-etpro-3.2.6-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=Enemy Territory ETPro - Minor additions to Enemy Territory to make it more fun
-EAPI=5
-HOMEPAGE=http://etpro.anime.net/
-IUSE=dedicated opengl dedicated opengl
-KEYWORDS=~amd64 ~x86
-LICENSE=all-rights-reserved
-RDEPEND=games-misc/games-envd dedicated? ( games-fps/enemy-territory[dedicated] ) opengl? ( || ( games-fps/enemy-territory[opengl] games-fps/enemy-territory[-dedicated] ) ) !dedicated? ( !opengl? ( || ( games-fps/enemy-territory[opengl] games-fps/enemy-territory[-dedicated] ) ) )
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=http://bani.anime.net/etpro/etpro-3_2_6.zip http://www.enemyterritory.sk/files/etpro-3_2_6.zip
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	games-mods	f7bc9bdfbc55069b9bb8ac2d21a82044	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=20d5772ba1bc7313e22fe908f1002031
diff --git a/metadata/md5-cache/games-fps/freedm-data-0.12.0 b/metadata/md5-cache/games-fps/freedm-data-0.12.0
index ece2ac483369..c478a35d177f 100644
--- a/metadata/md5-cache/games-fps/freedm-data-0.12.0
+++ b/metadata/md5-cache/games-fps/freedm-data-0.12.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/freedoom/freedoom/archive/v0.12.0.tar.gz -> freedoom-0.12.0.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5b41684b18992f5cfc0f7f91f6ef36a9
diff --git a/metadata/md5-cache/games-fps/freedoom-data-0.12.0 b/metadata/md5-cache/games-fps/freedoom-data-0.12.0
index f132dc6223ce..c5cd00f15da3 100644
--- a/metadata/md5-cache/games-fps/freedoom-data-0.12.0
+++ b/metadata/md5-cache/games-fps/freedoom-data-0.12.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/freedoom/freedoom/archive/v0.12.0.tar.gz -> freedoom-0.12.0.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=287951942c5ae220e16592c7c3b19a37
diff --git a/metadata/md5-cache/games-fps/gzdoom-4.2.1 b/metadata/md5-cache/games-fps/gzdoom-4.2.3
index 3f78bc6efd62..7cc59348eeec 100644
--- a/metadata/md5-cache/games-fps/gzdoom-4.2.1
+++ b/metadata/md5-cache/games-fps/gzdoom-4.2.3
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD BZIP2 DUMB-0.9.3 GPL-3 LGPL-3 MIT nonfree? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist )
 RDEPEND=media-libs/libsdl2[opengl] media-libs/libsndfile media-libs/openal media-sound/fluidsynth:= media-sound/mpg123 sys-libs/zlib virtual/jpeg:0 gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 ) )
 SLOT=0
-SRC_URI=https://github.com/coelckers/gzdoom/archive/g4.2.1.tar.gz -> gzdoom-4.2.1.tar.gz
+SRC_URI=https://github.com/coelckers/gzdoom/archive/g4.2.3.tar.gz -> gzdoom-4.2.3.tar.gz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=457ff7314ddb404a72ead33217ad0290
+_md5_=6cb3b09644bd539f5c4b714b478e094e
diff --git a/metadata/md5-cache/games-fps/openarena-0.8.8-r1 b/metadata/md5-cache/games-fps/openarena-0.8.8-r1
index 21188092787a..a0fa71765c00 100644
--- a/metadata/md5-cache/games-fps/openarena-0.8.8-r1
+++ b/metadata/md5-cache/games-fps/openarena-0.8.8-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=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 ) app-arch/unzip
+DEPEND=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 ) ) app-arch/unzip
 DESCRIPTION=Open-source replacement for Quake 3 Arena
 EAPI=6
 HOMEPAGE=http://openarena.ws/
-IUSE=+curl +openal +vorbis
+IUSE=+client +curl +openal +vorbis
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-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 )
+RDEPEND=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 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/oarena/openarena-0.8.8.zip mirror://sourceforge/oarena/src/openarena-engine-source-0.8.8.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=b3eee15f66296c23c8f48436d959c634
+_md5_=09e568b25fc4165e9dc3200915521e86
diff --git a/metadata/md5-cache/games-fps/ut2003-bonuspack-cm-1 b/metadata/md5-cache/games-fps/ut2003-bonuspack-cm-1
index 77c678decba2..ca5427098264 100644
--- a/metadata/md5-cache/games-fps/ut2003-bonuspack-cm-1
+++ b/metadata/md5-cache/games-fps/ut2003-bonuspack-cm-1
@@ -8,6 +8,6 @@ LICENSE=ut2003
 RDEPEND=games-fps/ut2003 games-misc/games-envd
 RESTRICT=bindist mirror strip
 SLOT=1
-SRC_URI=https://ut.rushbase.net/beyondunreal/mods/cbp2003.zip
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=71fc89e733993778690c4a83fbc1b0a3
+SRC_URI=https://downloads.unrealadmin.org/UT2003/BonusPack/cbp2003.zip
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=d6cb24473e3f257048f9e906b2ef7202
diff --git a/metadata/md5-cache/games-fps/ut2004-3369.3-r1 b/metadata/md5-cache/games-fps/ut2004-3369.3-r1
deleted file mode 100644
index 56aac45508ce..000000000000
--- a/metadata/md5-cache/games-fps/ut2004-3369.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup unpack
-DEPEND=app-arch/p7zip
-DESCRIPTION=Editor's Choice Edition plus Mega Pack for the well-known first-person shooter
-EAPI=5
-HOMEPAGE=http://www.unrealtournament2004.com/
-IUSE=dedicated opengl
-KEYWORDS=~amd64 ~x86
-LICENSE=ut2003
-RDEPEND=sys-libs/glibc games-fps/ut2004-data games-fps/ut2004-bonuspack-ece games-fps/ut2004-bonuspack-mega dedicated? ( !games-server/ut2004-ded ) opengl? ( =virtual/libstdc++-3.3 virtual/opengl x11-libs/libXext x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp media-libs/libsdl media-libs/openal ) !dedicated? ( !opengl? ( =virtual/libstdc++-3.3 virtual/opengl x11-libs/libXext x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp media-libs/libsdl media-libs/openal ) ) games-misc/games-envd
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=http://treefort.icculus.org/ut2004/ut2004-lnxpatch3369-2.tar.bz2 http://storage.guntoo.de/downs/downloads/Patch/ut2004-v3369-3-linux-dedicated.7z mirror://gentoo/ut2004-v3369-3-linux-dedicated.7z
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=54c54266da7b4e181f2b4c25f401075d
diff --git a/metadata/md5-cache/games-fps/ut2004-3369.3-r2 b/metadata/md5-cache/games-fps/ut2004-3369.3-r2
new file mode 100644
index 000000000000..4d1df60daa03
--- /dev/null
+++ b/metadata/md5-cache/games-fps/ut2004-3369.3-r2
@@ -0,0 +1,13 @@
+BDEPEND=app-arch/p7zip
+DEFINED_PHASES=config install postinst postrm prepare
+DESCRIPTION=Editor's Choice Edition plus Mega Pack for the well-known first-person shooter
+EAPI=7
+HOMEPAGE=https://liandri.beyondunreal.com/Unreal_Tournament_2004
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=ut2003
+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
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://ut2004.ut-files.com/Patches/Linux/ut2004-lnxpatch3369-2.tar.bz2 https://dev.gentoo.org/~chewi/distfiles/ut2004-v3369-3-linux-dedicated.7z
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8
+_md5_=57845ba6eb9b8159b38337e04a9c2ca3
diff --git a/metadata/md5-cache/games-fps/ut2004-action-1 b/metadata/md5-cache/games-fps/ut2004-action-1
deleted file mode 100644
index 97f89d7523ab..000000000000
--- a/metadata/md5-cache/games-fps/ut2004-action-1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=UT2004 Action - Action movie mod
-EAPI=5
-HOMEPAGE=https://www.moddb.com/mods/action-unreal-tournament/addons/action-unreal-tournament-r1
-IUSE=dedicated opengl dedicated opengl
-KEYWORDS=~amd64 ~x86
-LICENSE=freedist
-RDEPEND=games-misc/games-envd dedicated? ( || ( games-server/ut2004-ded games-fps/ut2004[dedicated] ) ) opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) !dedicated? ( !opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) )
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://ut.rushbase.net/beyondunreal/mods/aut-r1-msuc.zip
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	games-mods	f7bc9bdfbc55069b9bb8ac2d21a82044	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3ca8a19469a1b24de768ac6d8c06a6bb
diff --git a/metadata/md5-cache/games-fps/ut2004-airbuccaneers-1.6-r2 b/metadata/md5-cache/games-fps/ut2004-airbuccaneers-1.6-r2
deleted file mode 100644
index f2ad0ec70919..000000000000
--- a/metadata/md5-cache/games-fps/ut2004-airbuccaneers-1.6-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=UT2004 Air Buccaneers - Pirate-style conversion with flying wooden ships
-EAPI=5
-HOMEPAGE=http://www.ludocraft.com/entertainment/airbuccaneers-mod/
-IUSE=dedicated opengl dedicated opengl
-KEYWORDS=~amd64 ~x86
-LICENSE=freedist
-RDEPEND=games-misc/games-envd dedicated? ( || ( games-server/ut2004-ded games-fps/ut2004[dedicated] ) ) opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) !dedicated? ( !opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) )
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=http://bin.ludocraft.com/files/airbuccaneers_mod_1_6_zipinstall_with_info.zip
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	games-mods	f7bc9bdfbc55069b9bb8ac2d21a82044	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c6cc9762b260352b9deb2710c938279e
diff --git a/metadata/md5-cache/games-fps/ut2004-bonuspack-cbp1-1-r2 b/metadata/md5-cache/games-fps/ut2004-bonuspack-cbp1-1-r2
deleted file mode 100644
index 5a3f87f19045..000000000000
--- a/metadata/md5-cache/games-fps/ut2004-bonuspack-cbp1-1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=UT2004 Community Bonus Pack Vol 1 - UT2003 Community Bonus Pack for UT2004
-EAPI=5
-HOMEPAGE=https://liandri.beyondunreal.com/Unreal_Tournament_2004
-IUSE=dedicated opengl
-KEYWORDS=~amd64 ~x86
-LICENSE=freedist
-RDEPEND=games-misc/games-envd dedicated? ( || ( games-server/ut2004-ded games-fps/ut2004[dedicated] ) ) opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) !dedicated? ( !opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) )
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=http://downloads.unrealadmin.org/UT2004/BonusPack/cbp1.zip http://files.volved.com/qsr/ut2004_map_packs/cbp1.zip
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	games-mods	f7bc9bdfbc55069b9bb8ac2d21a82044	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b9c3684a510499e072e3e4214d28b2c2
diff --git a/metadata/md5-cache/games-fps/ut2004-bonuspack-cbp1-1-r3 b/metadata/md5-cache/games-fps/ut2004-bonuspack-cbp1-1-r3
new file mode 100644
index 000000000000..4f11aa466c90
--- /dev/null
+++ b/metadata/md5-cache/games-fps/ut2004-bonuspack-cbp1-1-r3
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=UT2003 Community Bonus Pack for UT2004 Volume 1
+EAPI=7
+HOMEPAGE=https://liandri.beyondunreal.com/Unreal_Tournament_2004
+KEYWORDS=~amd64 ~x86
+LICENSE=freedist
+RDEPEND=|| ( games-fps/ut2004 >=games-server/ut2004-ded-3369.3-r2 )
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://ut2004.ut-files.com/BonusPacks/cbp1.zip
+_md5_=55999b2c7288e0ebfce8c8bbfe3ee442
diff --git a/metadata/md5-cache/games-fps/ut2004-bonuspack-cbp2-1-r2 b/metadata/md5-cache/games-fps/ut2004-bonuspack-cbp2-1-r2
deleted file mode 100644
index 014731e2a6ae..000000000000
--- a/metadata/md5-cache/games-fps/ut2004-bonuspack-cbp2-1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=UT2004 Community Bonus Pack 2 Vol 1 and 2 - Community Bonus Pack 2 Vol 1 and 2
-EAPI=5
-HOMEPAGE=https://liandri.beyondunreal.com/Unreal_Tournament_2004
-IUSE=dedicated opengl
-KEYWORDS=~amd64 ~x86
-LICENSE=freedist
-RDEPEND=games-fps/ut2004-bonuspack-cbp1 games-fps/ut2004-bonuspack-mega games-misc/games-envd dedicated? ( || ( games-server/ut2004-ded games-fps/ut2004[dedicated] ) ) opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) !dedicated? ( !opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) )
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://ut.rushbase.net/beyondunreal/official/ut2004/cbp2-volume1_zip.zip https://ut.rushbase.net/beyondunreal/official/ut2004/cbp2-volume2_zip.zip
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	games-mods	f7bc9bdfbc55069b9bb8ac2d21a82044	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f828a6dc6c45c41603c9d735203f674b
diff --git a/metadata/md5-cache/games-fps/ut2004-bonuspack-cbp2-1-r3 b/metadata/md5-cache/games-fps/ut2004-bonuspack-cbp2-1-r3
new file mode 100644
index 000000000000..22a7d2b24681
--- /dev/null
+++ b/metadata/md5-cache/games-fps/ut2004-bonuspack-cbp2-1-r3
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install prepare
+DESCRIPTION=UT2004 Community Bonus Pack 2 Volume 1 and 2
+EAPI=7
+HOMEPAGE=https://liandri.beyondunreal.com/Unreal_Tournament_2004
+KEYWORDS=~amd64 ~x86
+LICENSE=freedist
+RDEPEND=|| ( games-fps/ut2004 >=games-server/ut2004-ded-3369.3-r2 ) games-fps/ut2004-bonuspack-cbp1 games-fps/ut2004-bonuspack-mega
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://ut2004.ut-files.com/BonusPacks/cbp2-volume1_zip.zip https://ut2004.ut-files.com/BonusPacks/cbp2-volume2_zip.zip
+_md5_=7ebe464809fb43742f71178d735bcc14
diff --git a/metadata/md5-cache/games-fps/ut2004-bonuspack-ece-1-r3 b/metadata/md5-cache/games-fps/ut2004-bonuspack-ece-1-r3
deleted file mode 100644
index efd1a95f7465..000000000000
--- a/metadata/md5-cache/games-fps/ut2004-bonuspack-ece-1-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=UT2004 Editor's Choice Edition - Editor's Choice Edition bonus pack
-EAPI=5
-HOMEPAGE=http://www.unrealtournament2004.com/
-IUSE=dedicated opengl
-KEYWORDS=~amd64 ~x86
-LICENSE=ut2003
-RDEPEND=games-misc/games-envd dedicated? ( || ( games-server/ut2004-ded games-fps/ut2004[dedicated] ) ) opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) !dedicated? ( !opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) )
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=http://ut2004.ut-files.com/BonusPacks/ut2004megapack-linux.tar.bz2 http://unrealmassdestruction.com/downloads/ut2k4/essentials/UT2004-ONSBonusMapPack.zip
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	games-mods	f7bc9bdfbc55069b9bb8ac2d21a82044	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=749a3135aba12254b0b61098ab7aa2d9
diff --git a/metadata/md5-cache/games-fps/ut2004-bonuspack-ece-1-r4 b/metadata/md5-cache/games-fps/ut2004-bonuspack-ece-1-r4
new file mode 100644
index 000000000000..fd80606e2af9
--- /dev/null
+++ b/metadata/md5-cache/games-fps/ut2004-bonuspack-ece-1-r4
@@ -0,0 +1,10 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install prepare unpack
+DESCRIPTION=UT2004 Editor's Choice Edition - Editor's Choice Edition bonus pack
+EAPI=7
+HOMEPAGE=http://www.unrealtournament2004.com/
+KEYWORDS=~amd64 ~x86
+LICENSE=ut2003
+SLOT=0
+SRC_URI=http://ut2004.ut-files.com/BonusPacks/ut2004megapack-linux.tar.bz2 http://unrealmassdestruction.com/downloads/ut2k4/essentials/UT2004-ONSBonusMapPack.zip
+_md5_=eaacbfe1557bc04153b9505c1526c03f
diff --git a/metadata/md5-cache/games-fps/ut2004-bonuspack-mega-1-r2 b/metadata/md5-cache/games-fps/ut2004-bonuspack-mega-1-r2
deleted file mode 100644
index 83144c956563..000000000000
--- a/metadata/md5-cache/games-fps/ut2004-bonuspack-mega-1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=UT2004 Megapack - Megapack bonus pack
-EAPI=5
-HOMEPAGE=http://www.unrealtournament2004.com/
-IUSE=dedicated opengl
-KEYWORDS=~amd64 ~x86
-LICENSE=ut2003
-RDEPEND=games-misc/games-envd dedicated? ( || ( games-server/ut2004-ded games-fps/ut2004[dedicated] ) ) opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) !dedicated? ( !opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) )
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=http://ut2004.ut-files.com/BonusPacks/ut2004megapack-linux.tar.bz2
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	games-mods	f7bc9bdfbc55069b9bb8ac2d21a82044	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1849e071749d572e6e3ba0166f8435d3
diff --git a/metadata/md5-cache/games-fps/ut2004-bonuspack-mega-1-r3 b/metadata/md5-cache/games-fps/ut2004-bonuspack-mega-1-r3
new file mode 100644
index 000000000000..358a81ef0cbf
--- /dev/null
+++ b/metadata/md5-cache/games-fps/ut2004-bonuspack-mega-1-r3
@@ -0,0 +1,10 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install prepare
+DESCRIPTION=UT2004 Megapack - Megapack bonus pack
+EAPI=7
+HOMEPAGE=http://www.unrealtournament2004.com/
+KEYWORDS=~amd64 ~x86
+LICENSE=ut2003
+SLOT=0
+SRC_URI=http://ut2004.ut-files.com/BonusPacks/ut2004megapack-linux.tar.bz2
+_md5_=789dee638f9579a99ac606ec576cb095
diff --git a/metadata/md5-cache/games-fps/ut2004-cor-1.01-r1 b/metadata/md5-cache/games-fps/ut2004-cor-1.01-r1
deleted file mode 100644
index f89165c21707..000000000000
--- a/metadata/md5-cache/games-fps/ut2004-cor-1.01-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=UT2004 Counter Organic Revolution - Shape-shifting robot teamplay mod
-EAPI=5
-HOMEPAGE=https://www.moddb.com/mods/counter-organic-revolution
-IUSE=dedicated opengl dedicated opengl
-KEYWORDS=~amd64 ~x86
-LICENSE=freedist
-RDEPEND=games-misc/games-envd dedicated? ( || ( games-server/ut2004-ded games-fps/ut2004[dedicated] ) ) opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) !dedicated? ( !opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) )
-RESTRICT=bindist mirror strip
-SLOT=0
-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
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	games-mods	f7bc9bdfbc55069b9bb8ac2d21a82044	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7c1ea5c2528bdc4062679329aeadd6ee
diff --git a/metadata/md5-cache/games-fps/ut2004-crossfire-1.95 b/metadata/md5-cache/games-fps/ut2004-crossfire-1.95
deleted file mode 100644
index e242071a8840..000000000000
--- a/metadata/md5-cache/games-fps/ut2004-crossfire-1.95
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=UT2004 Crossfire - Special Forces vs Terrorists
-EAPI=5
-HOMEPAGE=http://to-crossfire.tnc-clan.de/
-IUSE=dedicated opengl dedicated opengl
-KEYWORDS=~amd64 ~x86
-LICENSE=free-noncomm
-RDEPEND=games-misc/games-envd dedicated? ( || ( games-server/ut2004-ded games-fps/ut2004[dedicated] ) ) opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) !dedicated? ( !opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) )
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=ftp://files.tnc-clan.de/TOCrossfire/client/TOCrossfire_beta_1.95_full.zip
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	games-mods	f7bc9bdfbc55069b9bb8ac2d21a82044	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=04b49aa7636a85d6795d58ea2d56743c
diff --git a/metadata/md5-cache/games-fps/ut2004-data-3186-r4 b/metadata/md5-cache/games-fps/ut2004-data-3186-r4
deleted file mode 100644
index 79ef05308a11..000000000000
--- a/metadata/md5-cache/games-fps/ut2004-data-3186-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=games-util/uz2unpack >=app-arch/unshield-0.5-r1
-DESCRIPTION=Unreal Tournament 2004 - This is the data portion of UT2004
-EAPI=5
-HOMEPAGE=http://www.unrealtournament2004.com/
-KEYWORDS=~amd64 ~x86
-LICENSE=ut2003
-PDEPEND=games-fps/ut2004
-PROPERTIES=interactive
-RDEPEND=games-misc/games-envd
-SLOT=0
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	6ffe90ac67bc6ac95249cae335323907	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2d5b0504a4fb75a5ff3a76225798499d
diff --git a/metadata/md5-cache/games-fps/ut2004-data-3186-r5 b/metadata/md5-cache/games-fps/ut2004-data-3186-r5
new file mode 100644
index 000000000000..2e30656bdf1c
--- /dev/null
+++ b/metadata/md5-cache/games-fps/ut2004-data-3186-r5
@@ -0,0 +1,13 @@
+BDEPEND=games-util/uz2unpack >=app-arch/unshield-0.5-r1
+DEFINED_PHASES=install postinst postrm setup unpack
+DESCRIPTION=Unreal Tournament 2004 - This is the data portion of UT2004
+EAPI=7
+HOMEPAGE=https://liandri.beyondunreal.com/Unreal_Tournament_2004
+KEYWORDS=~amd64 ~x86
+LICENSE=ut2003
+PDEPEND=>=games-fps/ut2004-3369.3-r2
+PROPERTIES=interactive
+RDEPEND=!games-fps/ut2004-ded
+SLOT=0
+_eclasses_=cdrom	6ffe90ac67bc6ac95249cae335323907	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	portability	2b88d3ecc35035a3b8ab628b49cafb0e	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cc48eee771dd34ddfb985e00ac12cfdb
diff --git a/metadata/md5-cache/games-fps/ut2004-deathball-2.4w b/metadata/md5-cache/games-fps/ut2004-deathball-2.4w
deleted file mode 100644
index d62c8371754e..000000000000
--- a/metadata/md5-cache/games-fps/ut2004-deathball-2.4w
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=UT2004 Deathball - Fast-paced first person sport mod
-EAPI=5
-HOMEPAGE=http://www.deathball.net/
-IUSE=dedicated opengl dedicated opengl
-KEYWORDS=~amd64 ~x86
-LICENSE=freedist
-RDEPEND=games-misc/games-envd dedicated? ( || ( games-server/ut2004-ded games-fps/ut2004[dedicated] ) ) opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) !dedicated? ( !opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) )
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=http://www.deathball.net/downloads/deathball24w.zip
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	games-mods	f7bc9bdfbc55069b9bb8ac2d21a82044	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5d6c0197adb74cf91567011de187d420
diff --git a/metadata/md5-cache/games-fps/ut2004-fragops-2.20 b/metadata/md5-cache/games-fps/ut2004-fragops-2.20
deleted file mode 100644
index b18d4b5d37e0..000000000000
--- a/metadata/md5-cache/games-fps/ut2004-fragops-2.20
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=UT2004 Frag Ops - realism mod
-EAPI=5
-HOMEPAGE=https://www.moddb.com/mods/fragops
-IUSE=dedicated opengl dedicated opengl
-KEYWORDS=~amd64 ~x86
-LICENSE=freedist
-RDEPEND=games-misc/games-envd dedicated? ( || ( games-server/ut2004-ded games-fps/ut2004[dedicated] ) ) opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) !dedicated? ( !opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) )
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://ut.rushbase.net/beyondunreal/mods/fragops_v220_fulllmw.zip
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	games-mods	f7bc9bdfbc55069b9bb8ac2d21a82044	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6e49f21012842d9471d173361bcba31d
diff --git a/metadata/md5-cache/games-fps/ut2004-hamsterbash-1 b/metadata/md5-cache/games-fps/ut2004-hamsterbash-1
deleted file mode 100644
index bef831710bff..000000000000
--- a/metadata/md5-cache/games-fps/ut2004-hamsterbash-1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst preinst prepare setup unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=UT2004 Hamster Bash - Cute and violent hamster cage rampage mod
-EAPI=5
-HOMEPAGE=https://www.moddb.com/mods/hamsterbash
-IUSE=dedicated opengl dedicated opengl
-KEYWORDS=~amd64 ~x86
-LICENSE=freedist
-RDEPEND=games-misc/games-envd dedicated? ( || ( games-server/ut2004-ded games-fps/ut2004[dedicated] ) ) opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) !dedicated? ( !opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) )
-RESTRICT=fetch
-SLOT=0
-SRC_URI=HamsterBashFinal.zip
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	games-mods	f7bc9bdfbc55069b9bb8ac2d21a82044	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=03790f6d7d92a9c1e6f2e1b11a16e805
diff --git a/metadata/md5-cache/games-fps/ut2004-muralis-1.15 b/metadata/md5-cache/games-fps/ut2004-muralis-1.15
deleted file mode 100644
index a47a6b6954a8..000000000000
--- a/metadata/md5-cache/games-fps/ut2004-muralis-1.15
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=UT2004 Muralis - third-person hand-to-hand single/multiplayer mod
-EAPI=5
-HOMEPAGE=https://www.moddb.com/mods/muralis
-IUSE=dedicated opengl dedicated opengl
-KEYWORDS=~amd64 ~x86
-LICENSE=freedist
-RDEPEND=games-misc/games-envd dedicated? ( || ( games-server/ut2004-ded games-fps/ut2004[dedicated] ) ) opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) !dedicated? ( !opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) )
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://ut.rushbase.net/beyondunreal/mods/muralis-v1.15-zip.zip
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	games-mods	f7bc9bdfbc55069b9bb8ac2d21a82044	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=25f0e773d2d0a5113c32a0788c2c68c4
diff --git a/metadata/md5-cache/games-fps/ut2004-strikeforce-4.1 b/metadata/md5-cache/games-fps/ut2004-strikeforce-4.1
deleted file mode 100644
index 98bfef501dc0..000000000000
--- a/metadata/md5-cache/games-fps/ut2004-strikeforce-4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=UT2004 Strike Force - a terrorist vs. strike force mod
-EAPI=5
-HOMEPAGE=https://www.moddb.com/mods/strike-force-2004
-IUSE=dedicated opengl dedicated opengl
-KEYWORDS=~amd64 ~x86
-LICENSE=freedist
-RDEPEND=games-misc/games-envd dedicated? ( || ( games-server/ut2004-ded games-fps/ut2004[dedicated] ) ) opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) !dedicated? ( !opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) )
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://ut.rushbase.net/beyondunreal/mods/strikeforce-ce-v4.1.zip
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	games-mods	f7bc9bdfbc55069b9bb8ac2d21a82044	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dad35897abac4779f8618aeca334de16
diff --git a/metadata/md5-cache/games-fps/ut2004-troopers-6.0 b/metadata/md5-cache/games-fps/ut2004-troopers-6.0
deleted file mode 100644
index 833633effeb6..000000000000
--- a/metadata/md5-cache/games-fps/ut2004-troopers-6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst preinst prepare setup unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=UT2004 Troopers - Star Wars mod
-EAPI=5
-HOMEPAGE=https://www.moddb.com/mods/troopers-dawn-of-destiny/
-IUSE=dedicated opengl dedicated opengl
-KEYWORDS=~amd64 ~x86
-LICENSE=freedist
-RDEPEND=games-misc/games-envd dedicated? ( || ( games-server/ut2004-ded games-fps/ut2004[dedicated] ) ) opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) !dedicated? ( !opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) )
-RESTRICT=fetch
-SLOT=0
-SRC_URI=troopersversion60zip.zip
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	games-mods	f7bc9bdfbc55069b9bb8ac2d21a82044	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9208f67b9a1047eba859535cdef2ea44
diff --git a/metadata/md5-cache/games-fps/ut2004-unwheel-0_beta5 b/metadata/md5-cache/games-fps/ut2004-unwheel-0_beta5
deleted file mode 100644
index d3a8fce9baeb..000000000000
--- a/metadata/md5-cache/games-fps/ut2004-unwheel-0_beta5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst preinst prepare setup unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=UT2004 UnWheel - multiplayer driving mod focusing on fun driving
-EAPI=5
-HOMEPAGE=https://www.moddb.com/mods/unwheel
-IUSE=dedicated opengl dedicated opengl
-KEYWORDS=~amd64 ~x86
-LICENSE=GameFront
-RDEPEND=games-misc/games-envd dedicated? ( || ( games-server/ut2004-ded games-fps/ut2004[dedicated] ) ) opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) !dedicated? ( !opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) )
-RESTRICT=fetch bindist
-SLOT=0
-SRC_URI=unwheel_r5.zip unwheelcbpvol1.zip
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	games-mods	f7bc9bdfbc55069b9bb8ac2d21a82044	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2714d75bf1ccc59cf50b8ff2d7bbc1c2