gentoo resync : 08.07.2021

10 files changed, 382 insertions, 13 deletions

diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 473c36826d96..4b0698571309 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
diff --git a/games-fps/eduke32/Manifest b/games-fps/eduke32/Manifest
index 9bce266e5e98..da4462b0f78f 100644
--- a/games-fps/eduke32/Manifest
+++ b/games-fps/eduke32/Manifest
@@ -11,5 +11,7 @@ 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_20210624-9393-39e8f1852.tar.xz 20562500 BLAKE2B 46bb0fe5777040f3222c46ca5840b89f3173803891015a7a03344c87d8c7b00141e6838ed2ff6a74bd57b537bd61214e8ca7320b25dd103dc39056320ce51216 SHA512 59bd76fc35dc7031fe0a08fd5b2e3e24f4b8cc72fe410222f288457e8f290ebc5cf9a818961a45a4ca6086ebe4eb5d589185f254c1843169306a993dc0abf3c8
+DIST eduke32_src_20210707-9468-73aac5b2d.tar.xz 20683656 BLAKE2B 5dfab0d8f0cd35ae34f5190333ac89caca00edbfe5cf18f0b58b61ed9421f93f7cbc2757b7b07a34a06aa12897753e5bfafb46bb4cf1de9797e59fdf996c8f11 SHA512 426d5a6a1d9decb4deeac3125b91d9f0e7b7565771aca2013dd76f3749625185cb64d056a0c37ea24da0c1266965012a4485636eeb85df933f23c12136e08585
 EBUILD eduke32-20210624.9393.ebuild 5783 BLAKE2B 76c3ff1448241c360af4d35b0b484531e97a6455affb7e9327dbe6c066302a8b2e0cff312c9a90a88ccc662ed53e3cc846a9446520c44f73bb0e201b2ff8ad4d SHA512 60a6e78ff0476959fdb89522bd5c9584d2fe13e6b8d6b2325995711c3f2a18201ec60b8774888302b5eff189f0124cb439bf84e47c92c90138613448468411c0
+EBUILD eduke32-20210707.9468.ebuild 5783 BLAKE2B 0bdef134d3bf76a2f841d07f21418e9badd8d18e2f4eac891e292a6186b6695638679d4eaf7ad1a3544316f825a0f3d9a20aab270e94eb889e56f61a1ecf1b9b SHA512 871ef8f325bfd4e4b2e10fd0b5ce29d6ad0b319722fa94d0c8e58cc5083acc084945ca5641a9583dcd3abac3ad0f219652549944cac532deedda676a88e226aa
 MISC metadata.xml 1695 BLAKE2B 0d309ad2873afa0f103b2f37a585f0a80aed38fc360cac2e15bf7bbde421b30193bbcfa068339f2105ddf1bc02155fb3e803ce0d555a7659f88c6248dfeba62f SHA512 252924650afd01827d4cd39d6a7b43eb4fb8616f629e89a9b8ee9828de68f1586c63e458623e31f7e954320e50b081279edf88b0da935daaa5154d8a7d901597
diff --git a/games-fps/eduke32/eduke32-20210707.9468.ebuild b/games-fps/eduke32/eduke32-20210707.9468.ebuild
new file mode 100644
index 000000000000..81a188106b80
--- /dev/null
+++ b/games-fps/eduke32/eduke32-20210707.9468.ebuild
@@ -0,0 +1,219 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop toolchain-funcs xdg-utils
+
+EGIT_COMMIT="73aac5b2d"
+MY_BUILD="$(ver_cut 2)"
+MY_DATE="$(ver_cut 1)"
+MY_PV_HRP="5.4"
+MY_PV_OFFENSIVE_XXX="1.33"
+MY_PV_OPL="2.01"
+MY_PV_PSX="1.11"
+MY_PV_SC55="4.02"
+MY_PV_VOXELS="1.21"
+
+DESCRIPTION="An open source engine port of the classic PC first person shooter Duke Nukem 3D"
+HOMEPAGE="http://www.eduke32.com/"
+SRC_URI="
+	http://dukeworld.com/eduke32/synthesis/${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}/${PN}_src_${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}.tar.xz
+	https://www.eduke32.com/images/eduke32_classic.png
+	hrp? ( http://www.duke4.org/files/nightfright/hrp/duke3d_hrp.zip -> duke3d_hrp-${MY_PV_HRP}.zip )
+	offensive? ( http://www.duke4.org/files/nightfright/related/duke3d_xxx.zip -> duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip )
+	opl? ( https://www.moddb.com/downloads/mirror/95750/102/ce9e8f422c6cccdb297852426e96740a -> duke3d_musopl-${MY_PV_OPL}.zip )
+	psx? ( http://www.duke4.org/files/nightfright/related/duke3d_psx.zip -> duke3d_psx-${MY_PV_PSX}.zip )
+	sc-55? ( http://www.duke4.org/files/nightfright/music/duke3d_music-sc55.zip -> duke3d_music-sc55-${MY_PV_SC55}.zip )
+	voxels? ( https://www.dropbox.com/s/yaxfahyvskyvt4r/duke3d_voxels.zip -> duke3d_voxels-${MY_PV_VOXELS}.zip )
+"
+
+LICENSE="BUILDLIC GPL-2 HRP"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="duke3d fluidsynth gtk hrp offensive opengl opl png psx sc-55 server sdk timidity tools voidsw voxels vpx xmp"
+REQUIRED_USE="
+	hrp? ( duke3d !voxels )
+	offensive? ( duke3d )
+	opl? ( duke3d !sc-55 )
+	psx? ( duke3d )
+	sc-55? ( duke3d !opl )
+	voxels? ( !hrp )
+	vpx? ( opengl )
+"
+
+# There are no tests,
+# instead it tries to build a test game, which does not compile
+RESTRICT="bindist test"
+
+S="${WORKDIR}/${PN}_${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}"
+
+RDEPEND="
+	media-libs/flac
+	media-libs/libogg
+	media-libs/libsdl2[alsa,joystick,opengl?,sound,video]
+	media-libs/libvorbis
+	media-libs/sdl2-mixer[flac,fluidsynth?,midi,timidity?,vorbis]
+	sys-libs/zlib
+	gtk? ( x11-libs/gtk+:2 )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)
+	png? ( media-libs/libpng:0= )
+	vpx? ( media-libs/libvpx:= )
+	xmp? ( media-libs/exempi:2= )
+"
+
+DEPEND="
+	${RDEPEND}
+	timidity? ( media-sound/timidity++ )
+"
+
+BDEPEND="
+	app-arch/unzip
+	x86? ( dev-lang/nasm )
+"
+
+PDEPEND="duke3d? ( games-fps/duke3d-data )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-20190820.8043-log-to-tmpdir.patch"
+	"${FILESDIR}/${PN}-20190820.8043-search-duke3d-path.patch"
+	"${FILESDIR}/${PN}-20200505.8904-gcc10.patch"
+)
+
+src_unpack() {
+	# Extract only the eduke32 archive
+	unpack ${PN}_src_${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}.tar.xz
+
+	# Unpack only the documentation
+	if use hrp; then
+		unzip -q "${DISTDIR}"/duke3d_hrp-${MY_PV_HRP}.zip hrp_readme.txt hrp_todo.txt || die
+	fi
+	if use offensive; then
+		unzip -q "${DISTDIR}"/duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip xxx_readme.txt || die
+	fi
+	if use opl; then
+		unzip -q "${DISTDIR}"/duke3d_musopl-${MY_PV_OPL}.zip readme.txt || die
+		mv readme.txt opl_readme.txt || die
+	fi
+	if use sc-55; then
+		unzip -q "${DISTDIR}"/duke3d_music-sc55-${MY_PV_SC55}.zip readme/music_readme.txt || die
+	fi
+	if use voxels; then
+		unzip -q "${DISTDIR}"/duke3d_voxels-${MY_PV_VOXELS}.zip voxelpack_readme.txt || die
+	fi
+}
+
+src_compile() {
+	local myemakeopts=(
+		ALLOCACHE_AS_MALLOC=0
+		AS=$(tc-getAS)
+		CC=$(tc-getCC)
+		CXX=$(tc-getCXX)
+		CLANG=0
+		CPLUSPLUS=1
+		CUSTOMOPT=""
+		DEBUGANYWAY=0
+		F_JUMP_TABLES=""
+		FORCEDEBUG=0
+		HAVE_FLAC=1
+		HAVE_GTK2=$(usex gtk 1 0)
+		HAVE_XMP=$(usex xmp 1 0)
+		LINKED_GTK=$(usex gtk 1 0)
+		LTO=1
+		LUNATIC=0
+		KRANDDEBUG=0
+		MEMMAP=0
+		MIXERTYPE=SDL
+		NETCODE=$(usex server 1 0)
+		NOASM=0
+		OPTLEVEL=0
+		OPTOPT=""
+		PACKAGE_REPOSITORY=1
+		POLYMER=$(usex opengl 1 0)
+		PRETTY_OUTPUT=0
+		PROFILER=0
+		RELEASE=1
+		RENDERTYPE=SDL
+		SDL_TARGET=2
+		SIMPLE_MENU=0
+		STRIP=""
+		TANDALONE=0
+		STARTUP_WINDOW=$(usex gtk 1 0)
+		USE_OPENGL=$(usex opengl 1 0)
+		USE_LIBVPX=$(usex vpx 1 0)
+		USE_LIBPNG=$(usex png 1 0)
+		USE_LUAJIT_2_1=0
+		WITHOUT_GTK=$(usex gtk 0 1)
+	)
+
+	emake "${myemakeopts[@]}"
+
+	use tools && emake utils "${myemakeopts[@]}"
+	use voidsw && emake sw "${myemakeopts[@]}"
+}
+
+src_install() {
+	dobin eduke32 mapster32 "${FILESDIR}"/eduke32-bin
+	use voidsw && dobin voidsw "${FILESDIR}"/voidsw-bin
+
+	if use tools; then
+		local tools=(
+			arttool
+			bsuite
+			cacheinfo
+			generateicon
+			givedepth
+			ivfrate
+			kextract
+			kgroup
+			kmd2tool
+			makesdlkeytrans
+			map2stl
+			md2tool
+			mkpalette
+			transpal
+			unpackssi
+			wad2art
+			wad2map
+		)
+
+		dobin "${tools[@]}"
+	fi
+
+	keepdir /usr/share/games/eduke32
+	insinto /usr/share/games/eduke32
+
+	use hrp && doins "${DISTDIR}"/duke3d_hrp-${MY_PV_HRP}.zip
+	use offensive && doins "${DISTDIR}"/duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip
+	use opl && doins "${DISTDIR}"/duke3d_musopl-${MY_PV_OPL}.zip
+	use psx && doins "${DISTDIR}"/duke3d_psx-${MY_PV_PSX}.zip
+	use sc-55 && doins "${DISTDIR}"/duke3d_music-sc55-${MY_PV_SC55}.zip
+	use sdk && doins -r package/sdk
+	use voxels && doins "${DISTDIR}"/duke3d_voxels-${MY_PV_VOXELS}.zip
+
+	newicon "${DISTDIR}"/eduke32_classic.png eduke32.png
+
+	make_desktop_entry eduke32-bin EDuke32 eduke32 Game
+	make_desktop_entry mapster32 Mapster32 eduke32 Game
+	use voidsw && make_desktop_entry voidsw-bin VoidSW voidsw Game
+
+	local DOCS=( package/sdk/samples/*.txt source/build/doc/*.txt )
+	use hrp && DOCS+=( "${WORKDIR}"/hrp_readme.txt "${WORKDIR}"/hrp_todo.txt )
+	use offensive && DOCS+=( "${WORKDIR}"/xxx_readme.txt )
+	use opl && DOCS+=( "${WORKDIR}"/opl_readme.txt )
+	use sc-55 && DOCS+=( "${WORKDIR}"/readme/music_readme.txt )
+	use voxels && DOCS+=( "${WORKDIR}"/voxelpack_readme.txt )
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/games-fps/freedm-data/Manifest b/games-fps/freedm-data/Manifest
index 3f7f819e1e23..84cde8c5e7ee 100644
--- a/games-fps/freedm-data/Manifest
+++ b/games-fps/freedm-data/Manifest
@@ -1,3 +1,3 @@
 DIST freedoom-0.12.1.tar.gz 18405081 BLAKE2B a508d9ce924ff10640d6017302864869efff474c89fe20a866082b565a1ce65182483a5a692c9ce3329b81472ae9e4fee4ac2511670ecb5dd06ccf81930ac70d SHA512 7db65b039ce98593a86a19b46efe629b85a339c4c020750c3abb95d226fca484c63686ab8c88ecc1e16e86a6aca3b8c7952d85103e0f3db07cc7204fa528daf2
-EBUILD freedm-data-0.12.1.ebuild 1088 BLAKE2B 83884cd66cbb93b2c627af4a88b3a7399c72933d6fe38560d08aeeda08a5c15959cb7b2ae4437312c27ba72e8e839015f0124e21c756a846a3e44cdc0f0b031f SHA512 1e52fe1c6b827f7c2d02cd5816fb977d730f49a22312883dccc2576b7a9df6c708fd17c14a08203f3f135f6ae28fd909d0aab771d746644294d5b4f3a141641b
+EBUILD freedm-data-0.12.1.ebuild 1086 BLAKE2B b59e7abc6ecb488b05e8dbaff5bbe901a389be303e129411023d9f65c6b4b4c3c9e3866b3d378673e52bcd4d2d89a1cb700aeb86bcad5961d3b4440f1fc8c15b SHA512 b75845ee30061170b93beb293ba5a473e00d528cddd3edda092b8de467737920e159a8a62d4f7d55df456d7d7b1dea0f47582cc3aadbba773c5b282414a0bc31
 MISC metadata.xml 1510 BLAKE2B 228d6788aedc580020163b04ffafb826c8e68aff148cf9d72743d64f8ee953e20fc67e246963ded56481b5aeee539d45b84af395bd604dc5bb07bfb9b8d763db SHA512 06e30065de755cc85aaee05597722a7d2679870a602214f82e49008c4dda0635f14f5724d1e07a20276abcb6ec9c1d14a5058451ed0a2f4edf63ff1f82920690
diff --git a/games-fps/freedm-data/freedm-data-0.12.1.ebuild b/games-fps/freedm-data/freedm-data-0.12.1.ebuild
index 791aeefb98a4..fa8948dc07d3 100644
--- a/games-fps/freedm-data/freedm-data-0.12.1.ebuild
+++ b/games-fps/freedm-data/freedm-data-0.12.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 
 inherit prefix python-any-r1 xdg
 
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 
 BDEPEND="
-	$(python_gen_any_dep 'dev-python/pillow[${PYTHON_USEDEP}]')
+	$(python_gen_any_dep 'dev-python/pillow[${PYTHON_USEDEP},zlib]')
 	app-text/asciidoc
 	games-util/deutex"
 
@@ -25,12 +25,11 @@ S="${WORKDIR}/freedoom-${PV}"
 DOOMWADPATH=share/doom
 
 python_check_deps() {
-	has_version -b "dev-python/pillow[${PYTHON_USEDEP}]"
+	has_version -b "dev-python/pillow[${PYTHON_USEDEP},zlib]"
 }
 
 src_prepare() {
 	xdg_src_prepare
-	eapply_user
 
 	hprefixify dist/freedoom
 }
diff --git a/games-fps/freedoom-data/Manifest b/games-fps/freedoom-data/Manifest
index d2d492a9f1c7..da1ec0666cf8 100644
--- a/games-fps/freedoom-data/Manifest
+++ b/games-fps/freedoom-data/Manifest
@@ -1,3 +1,3 @@
 DIST freedoom-0.12.1.tar.gz 18405081 BLAKE2B a508d9ce924ff10640d6017302864869efff474c89fe20a866082b565a1ce65182483a5a692c9ce3329b81472ae9e4fee4ac2511670ecb5dd06ccf81930ac70d SHA512 7db65b039ce98593a86a19b46efe629b85a339c4c020750c3abb95d226fca484c63686ab8c88ecc1e16e86a6aca3b8c7952d85103e0f3db07cc7204fa528daf2
-EBUILD freedoom-data-0.12.1.ebuild 1120 BLAKE2B 1f56b537fa526bbe8cf92f9f429ff4ceb9e2e2ec1540a8654286927abead877cb6b69849c35374434eaca531319ca666ec948249bc423db5d1d7bfa91194851d SHA512 548927cecbaa06a7e983addc2c9a01b319d1f0b43eb4a15a5fc414b486d754191fe5034ef2b79e2c8e2108950ab994a5209ae14fe2cfce25bf869105f2b3f77b
+EBUILD freedoom-data-0.12.1.ebuild 1118 BLAKE2B 24613fab215ab2e977bb4cfb16bf5deea7a6f4fb534c1bac7d566b540ca83630d05393c96257a3847d72a375bd1c5e1990a159cda422f702a47a35010584a85c SHA512 11e54ee30ca0fbd77238087af3336a0f0325663f8a3b5412d63412ad71e11e128a68289ff126187e4b4f1b2593b826e2402b5c9715317b88d39aadfc9cd970df
 MISC metadata.xml 1839 BLAKE2B e512baac046ee7dea937cbae541d36bc541305b0325879d6676d0c00750a3e104b6b9102d95ef016659467ab574ef746e5c6cb3e6cd1e9e5891dfb174430f7c7 SHA512 7713a4ecd003d543b8919c26400b1ba6f388767d6b43f4ba8a606277d1c39b6be696d1de83767f5eaf71057a0feffb66aa514bed7758d15f951c72e4ff65616b
diff --git a/games-fps/freedoom-data/freedoom-data-0.12.1.ebuild b/games-fps/freedoom-data/freedoom-data-0.12.1.ebuild
index d506e261de89..d0402108c77b 100644
--- a/games-fps/freedoom-data/freedoom-data-0.12.1.ebuild
+++ b/games-fps/freedoom-data/freedoom-data-0.12.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 
 inherit prefix python-any-r1 xdg
 
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 
 BDEPEND="
-	$(python_gen_any_dep 'dev-python/pillow[${PYTHON_USEDEP}]')
+	$(python_gen_any_dep 'dev-python/pillow[${PYTHON_USEDEP},zlib]')
 	app-text/asciidoc
 	games-util/deutex"
 
@@ -25,12 +25,11 @@ S="${WORKDIR}/freedoom-${PV}"
 DOOMWADPATH=share/doom
 
 python_check_deps() {
-	has_version -b "dev-python/pillow[${PYTHON_USEDEP}]"
+	has_version -b "dev-python/pillow[${PYTHON_USEDEP},zlib]"
 }
 
 src_prepare() {
 	xdg_src_prepare
-	eapply_user
 
 	hprefixify dist/freedoom
 }
diff --git a/games-fps/yamagi-quake2/Manifest b/games-fps/yamagi-quake2/Manifest
index 5f8bed0c30a6..4370dbe23788 100644
--- a/games-fps/yamagi-quake2/Manifest
+++ b/games-fps/yamagi-quake2/Manifest
@@ -1,8 +1,14 @@
 AUX yamagi-quake2-addon-respect-flags-r3.patch 996 BLAKE2B 7d3c6f13b4973db9d63e15de469953699df48668d5bc5d69607f090f6bac57ea4119174f6de3306f1fc8cd2acdbfb90b8808eebfa7af7e4b4b5996d3b2546d93 SHA512 7136ccc0d666ef14f040e7ca19506dd0be5debe21f0eb819c74851e80445187f98ae60f76d8038d2ead40b1ef0f56643f769d6f9e4241e2b175ea11a19a676da
 AUX yamagi-quake2-addon-respect-flags-r4.patch 901 BLAKE2B 3aea1c44231122cc95e5f17ae3051111a77a688abf1553470725266a7619ee810878362abbf2b99371e023bee7975542a63bf7fe93153fed95a60ac77285a9d3 SHA512 ede9fcc0db375defbfe8e79105ca330d8ed46498f67a858b923f337eef558ac4dc9f54b8d3de895e7269750009f26c1643c4e3c26362c2f2be751005ec42d855
 DIST quake2-7.45.tar.xz 1997816 BLAKE2B 1025a3e226e80b456c48fcd76100f46fa03e3ef2c61d70071136f8119f2b2af39b24fa859239217d34d14501127e4880ff7b61b79dc61c79e64dd22fcc44ce0b SHA512 1aa161ca03782eba14feecd142d65eb5a9ca5af4b384f21d3e68338cd8d88bd5e71c1678d44285eea692d5d1b2161429270745d880b4caacd6c87c7e76ed404b
+DIST quake2-8.00.tar.xz 2086776 BLAKE2B 6a525b0d3703e17ca6ff85cbef7cf0c0522308fb71f8db4649e7bfbe3326c610d878d6a4af36ed6a578c700c5e1d004be7c0a9dd86cb495a27c8deb8b761eab9 SHA512 886c0df687e7e64a534f6e6f0b212084212d4d5c1278d2567b25bdd48df9ffab9ce75894ab6cfc2fd3a070adf9c1e3d7bb2e823d4f5aef8ef2cbc21c21c063bd
 DIST quake2-ctf-1.07.tar.xz 135880 BLAKE2B 7501d5db676cbc7b523313bf4e5d572cc8711efd09e2390d6aa6980d45bc682e7f137581b8a9a8d4b491de8f8ed7dd1cb32a66c9ed2cc456e114f672cedf2a1c SHA512 de2ab94fc7bb43327170f6aefbaf811e7a0071da2e5c4602354854e46e4c8cfc687a6300e7162c8f1be2f0b42cf2d3edc255c2f44fb0e39adc873a521197a316
+DIST quake2-ctf-1.08.tar.xz 136468 BLAKE2B cce9f75333c03494dccc1a693c3c0a62194457673c17c59cd5d08a06a11daa769dabaf787c04d9de291c7cc255b4decef06ae5f045c5bc7bc3f4008f0e6babdb SHA512 3d3343ae5287c5f01efd3363ede19f2e41cc8d083691c928afd9e4a81c0b46f6002eb2ed99d11742b7c04f8ea728a1dbb3b5d26ce4fd1066b4f49e3fb664317e
+DIST quake2-ref_vk-1.0.1.tar.gz 290799 BLAKE2B 0716d539704a58067fd2d6d4f21b27976c6bd073b2722584a804c9702f2886b252701d81f2fe1e5aba22ab83fbddd1e35ce3574c3e3d41b609ebac417ee7cfe4 SHA512 99a6b7191a2eed714f70ec389a1f1972f430b9ba324e6880ce96101336beac640fef2d45adc1a6bf04c386a1d088fafd401d303704079ed7207fe7b56d2758db
 DIST quake2-rogue-2.07.tar.xz 243828 BLAKE2B f292bc7318ee8094b0dae0219fbf7882fb9a168ee2b311c254b5cabdb53f6a65350be80ea09185f66b5e3af4e670c3dd21235a06aeec2f334dc84cb474cb02da SHA512 21b0dca16240307c1e7a6c2a2c08e380fabf4f6bdbf1981a2183056ccd5f05f7003f41b38b4b131f9b16909b4c714ff2ef23638601b0c420003674bc9a9d0789
+DIST quake2-rogue-2.08.tar.xz 282140 BLAKE2B e4ead304f35028010f4ffea6eed15753feac99cfa301975f8cae88d9ac10313c9e1a9e29e37d4f186df34abf659dd45b79bda04b5f420565f256bde8b69ab199 SHA512 216b8a9862c7f189bdabc68770306ead4fa2173f9051a8fd2a7927eae8aa4e42116bbde947591432d200832a3038c79316325549822fa531fc0e76a2bec57762
 DIST quake2-xatrix-2.08.tar.xz 192760 BLAKE2B ce6d4bae8ed2970e9ca9971c32fba6b226d7d7616dc7e5168d1504f6ae62ece286c21c22f0f8a3d2df48f7b63b53ec681efa92074f918ef4e5c9b98667e2682b SHA512 cc8fd7add3ded10ad88f1a1629c7222c26a398fa47c2c1aa6091dc310b7f2f5830c997c534b38cc0f6d4153357d76901ba48dbd505ce96f95d84f97f2f0dddd9
+DIST quake2-xatrix-2.09.tar.xz 214096 BLAKE2B a4115da0d5624245d1065a67379d95a2b22330e1a5a999d7493d832d5edca4c83752f3a447ab1934c6709b7ed9247d5edd2b3f4b9b398a04982a9428381f2f9d SHA512 a4cf351eca2a72e6b5d8eeecf5d582a3c2c677b71dcf6bcdea310f1503f55ad8ccaf7225461bd78fc695e90d57525fd9a53c5d17e1eabd3a1d28e9386331399c
 EBUILD yamagi-quake2-7.45.ebuild 3505 BLAKE2B ee81e8ec438825670f846c562713c95b7e93a1e77ac88dae61e25bad137376a3076a5dee28435ee03989eb41a40e534d847e68b809610bb2bdd7fe2a3e1c4963 SHA512 5f7391f6fc29d61b819400e9391f54788e9f457cf6d3ecb5bf6120601e615e1edcfd5e78046f50da1e0b2eb052a3b80d59b83d174bd52dabd7af4344500e705e
-MISC metadata.xml 932 BLAKE2B c7754bc8d2a5f53d84108283e176df88686573e80e632c37f7d09e2fa2dd0d1e708adf3a04004c14c74f088bfe873593cbd0b7448fae9b0d308f312533da81e6 SHA512 b0ff273cc5e2594b7a5285e1f094ac7505486f221a46d784ba167f57a625ba1d4222369d006f9cd31ffccefd42dd1bb7015c9aa96d236be52e4484d04ed70215
+EBUILD yamagi-quake2-8.00.ebuild 3608 BLAKE2B 52f857ec1e61ac6a73a0186f5c96acc7350214a0b2731ac5e13eb46a63a7b6bc22fd052c996c9c8701d927de49cc11701c07163e9070c0472a1b62750d309692 SHA512 a5b07b47fc3c4e56845f900b8fce24ff7edc94eb287c864aa62f312d8edae7f3772010c5284c4fea55321a0088452fd8302da9e7426e3eaf3967fffa9dd66dd4
+MISC metadata.xml 996 BLAKE2B 3e10ddd1b6211f4fb9ab206881e2153de5588f184426dc198ed8e2194497bb45ca16aab20bc1764392405ab301b533173c99c9edc491ac1256701fd4005e5424 SHA512 b2d0c6e4f376d08d29641e778ac446d59d09f644beb3bf3121e4afddcae130cbfa630bebf4d3c940a58e40a6a71543fe437820ad3d083b8b937809eb3c92b76e
diff --git a/games-fps/yamagi-quake2/metadata.xml b/games-fps/yamagi-quake2/metadata.xml
index 1e4e7f687ed0..2b7164c258b4 100644
--- a/games-fps/yamagi-quake2/metadata.xml
+++ b/games-fps/yamagi-quake2/metadata.xml
@@ -21,6 +21,7 @@
 		<flag name="ctf">Build support for the 'Capture The Flag' addon</flag>
 		<flag name="rogue">Build support for the 'Ground Zero' Mission Pack</flag>
 		<flag name="softrender">Build software renderer</flag>
+		<flag name="vulkan">Build experimental Vulkan renderer</flag>
 		<flag name="xatrix">Build support for the 'The Reckoning' Mission Pack</flag>
 	</use>
 </pkgmetadata>
diff --git a/games-fps/yamagi-quake2/yamagi-quake2-8.00.ebuild b/games-fps/yamagi-quake2/yamagi-quake2-8.00.ebuild
new file mode 100644
index 000000000000..195061628b29
--- /dev/null
+++ b/games-fps/yamagi-quake2/yamagi-quake2-8.00.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop toolchain-funcs wrapper
+
+CTF_V="1.08"
+ROGUE_V="2.08"
+XATRIX_V="2.09"
+REF_VK_V="1.0.1"
+
+DESCRIPTION="Quake 2 engine focused on single player"
+HOMEPAGE="https://www.yamagi.org/quake2/"
+SRC_URI="https://deponie.yamagi.org/quake2/quake2-${PV}.tar.xz
+	ctf? ( https://deponie.yamagi.org/quake2/quake2-ctf-${CTF_V}.tar.xz )
+	rogue? ( https://deponie.yamagi.org/quake2/quake2-rogue-${ROGUE_V}.tar.xz )
+	xatrix? ( https://deponie.yamagi.org/quake2/quake2-xatrix-${XATRIX_V}.tar.xz )
+	vulkan? ( https://github.com/yquake2/ref_vk/archive/refs/tags/v${REF_VK_V}.tar.gz ->
+		quake2-ref_vk-${REF_VK_V}.tar.gz )
+"
+S="${WORKDIR}/quake2-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+client ctf dedicated openal +opengl rogue softrender vulkan xatrix"
+REQUIRED_USE="
+	|| ( client dedicated )
+	client? ( || ( opengl softrender vulkan ) )
+"
+
+RDEPEND="
+	client? (
+		media-libs/libsdl2[opengl?,video,vulkan?]
+		net-misc/curl
+		openal? ( media-libs/openal )
+		!openal? ( media-libs/libsdl2[sound] )
+		opengl? ( virtual/opengl )
+	)
+"
+DEPEND="${RDEPEND}
+	client? ( vulkan? ( dev-util/vulkan-headers ) )
+"
+
+DOCS=( CHANGELOG README.md doc )
+
+src_compile() {
+	tc-export CC
+
+	local targets=( game )
+	local emakeargs=(
+		VERBOSE=1
+		WITH_SYSTEMWIDE=yes
+		WITH_SYSTEMDIR="${EPREFIX}"/usr/share/quake2
+		WITH_OPENAL=$(usex openal)
+	)
+
+	if use client; then
+		targets+=( client )
+		use opengl && targets+=( ref_gl1 ref_gl3 )
+		use softrender && targets+=( ref_soft )
+	fi
+	use dedicated && targets+=( server )
+
+	emake "${emakeargs[@]}" config
+	emake "${emakeargs[@]}" "${targets[@]}"
+
+	if use client && use vulkan; then
+		emake -C "${WORKDIR}"/ref_vk-${REF_VK_V} VERBOSE=1
+	fi
+
+	local addon
+	for addon in $(usev ctf) $(usev rogue) $(usev xatrix); do
+		emake -C "${WORKDIR}"/quake2-${addon}-* VERBOSE=1
+	done
+}
+
+src_install() {
+	insinto /usr/lib/yamagi-quake2
+	# Yamagi Quake II expects all binaries to be in the same directory
+	# See doc/070_packaging.md for more info
+	exeinto /usr/lib/yamagi-quake2
+	doins -r release/.
+
+	if use client; then
+		doexe release/quake2
+		dosym ../lib/yamagi-quake2/quake2 /usr/bin/yquake2
+
+		newicon stuff/icon/Quake2.svg "yamagi-quake2.svg"
+		make_desktop_entry "yquake2" "Yamagi Quake II"
+
+		if use vulkan; then
+			doins "${WORKDIR}"/ref_vk-${REF_VK_V}/release/ref_vk.so
+		fi
+	fi
+
+	if use dedicated; then
+		doexe release/q2ded
+		dosym ../lib/yamagi-quake2/q2ded /usr/bin/yq2ded
+	fi
+
+	insinto /usr/lib/yamagi-quake2/baseq2
+	doins stuff/yq2.cfg
+
+	local addon
+	for addon in $(usev ctf) $(usev rogue) $(usev xatrix); do
+		insinto /usr/lib/yamagi-quake2/${addon}
+		doins "${WORKDIR}"/quake2-${addon}-*/release/game.so
+
+		if use client; then
+			local addon_name
+			case ${addon} in
+				ctf)    addon_name="CTF" ;;
+				rogue)  addon_name="Ground Zero" ;;
+				xatrix) addon_name="The Reckoning" ;;
+			esac
+
+			make_wrapper "yquake2-${addon}" "yquake2 +set game ${addon}"
+			make_desktop_entry "yquake2-${addon}" "Yamagi Quake II: ${addon_name}"
+		fi
+	done
+
+	keepdir /usr/share/quake2
+
+	einstalldocs
+	if use client; then
+		docinto examples
+		dodoc stuff/cdripper.sh
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "In order to play, you should do one of the following things:"
+		elog " - install games-fps/quake2-data or games-fps/quake2-demodata;"
+		elog " - manually copy game data files into ~/.yq2/ or"
+		elog "   ${EROOT}/usr/share/quake2/."
+		elog "Read ${EROOT}/usr/share/doc/${PF}/README.md* for more information."
+		elog
+	fi
+}