gentoo resync : 29.12.2022

4 files changed, 17 insertions, 90 deletions

diff --git a/games-fps/doomsday/Manifest b/games-fps/doomsday/Manifest
index f833fa9c8131..27b0e3992803 100644
--- a/games-fps/doomsday/Manifest
+++ b/games-fps/doomsday/Manifest
@@ -1,5 +1,3 @@
-DIST doomsday-2.1.1.tar.gz 47526008 BLAKE2B bf941048d160058273df09d67b09e140c10d141cd73ff56d0f3162045696d81533aba9a8c9ff39fc29530248ee8b2f6dd2b3da76a929fb6263c311e65bcbdd82 SHA512 9df0afa0465ef3c3bb30cccf8ca51596e8e6e5584775a695c9c3278f15bcf7e9f7aaeaa0917f0a1de9fbb1174f2ae83a1ee85fba63bef6e49be957836f1107a3
-DIST doomsday-2.3.0.tar.gz 47838189 BLAKE2B 807204cd5e716f57291e383b6a2f0570c01f3e4a92d575f5e585cf1e793785031edd845399dd6896766b1c77425b2fefd6f5f5913adc5fcb7bb1415b2f906c98 SHA512 46d92743e981804eca3ed6e486c4a748114621053d6269a0c0bc5fa84a591f6556ad3226ab6fb3cbc8642ac2f128885261c0bdc78bb5f2012a25f2cab6413461
-EBUILD doomsday-2.1.1-r1.ebuild 2012 BLAKE2B 88c84777a1792331482c54bc0ce698a7681b3d8d633ba5adc35fd607ec34bd5c43ba5bedf54b2bb5542c817ae4dc626c51716aead09dc153d489ec2cb1b2cc8c SHA512 571132c4ab808ecd026512786f237dc3f92ac010fd2d2d71c5b42fc2e33c2964c4431a6286b94c31b126c6bfca53b5310c7a0f4b2a93dede33e61c0a074bc000
-EBUILD doomsday-2.3.0.ebuild 2012 BLAKE2B 88c84777a1792331482c54bc0ce698a7681b3d8d633ba5adc35fd607ec34bd5c43ba5bedf54b2bb5542c817ae4dc626c51716aead09dc153d489ec2cb1b2cc8c SHA512 571132c4ab808ecd026512786f237dc3f92ac010fd2d2d71c5b42fc2e33c2964c4431a6286b94c31b126c6bfca53b5310c7a0f4b2a93dede33e61c0a074bc000
-MISC metadata.xml 693 BLAKE2B 918ead09db13e6cfe1df4baec2aac819d6f679283cde8e934fa19bed46e756347f0e012f7945b5bba800b7b349aa33cb412a3cd63320bb0cecadba81a4aa422e SHA512 e4aec4d6f7152b07da0ae2063146721f5ce7dc36456b9b2137ad8255a549dce6264eea247d6d2decf0725ae97c355f68f371159c5c61837aaf5b4604ff166e7e
+DIST doomsday-2.3.1.tar.gz 47840812 BLAKE2B 5a45c9e0f781f0cc67367c703504568ee7f7cd0a96c57266ccf6bfbdf0d1e4ef838b2605b7dcecafe91f18d29c40ddbf9f6b5b0c049e94a95ce9fbbba4bddd1a SHA512 ca952fe0191529fe1192b16331d6c17d14e106f2366f5517177e51fdb50ea32baa2bf70d22bde5946101fac2926333fce6a8a317bc662df9f7662c5e023a669c
+EBUILD doomsday-2.3.1.ebuild 2175 BLAKE2B 3f81b66f89e67703754423d93f44dae192b6bfba3d920d2ab3c0144dd5c836341db714e2ec6d034faaece7cef6bde260f053c5b17f96c2588d499975c4de9a89 SHA512 66cd43e26a0730505159324d6a4471b4ec772285ce99dacd6a3c36189d2b6c504626febea285762a536396eacd0199a6bf329ced4a0200d6ac6bd213130be522
+MISC metadata.xml 772 BLAKE2B b5c1d982a07fc1e9ff88e3d7c081a960c0e2bdddcb09fcac887052dfed687d08b5dde635004ef616d26eb05893654642cc681ebe11af00ed9a0b2a28764b8b69 SHA512 d1b4674a42a2f2fed4c32ba96f67102cdeaae13a5da68c838cc959c33d9b52966acfbfce552eb532a9c614268c215d44af69796a9269ca04e8f57a06d7f029db
diff --git a/games-fps/doomsday/doomsday-2.3.0.ebuild b/games-fps/doomsday/doomsday-2.3.0.ebuild
deleted file mode 100644
index fbb7fa20132f..000000000000
--- a/games-fps/doomsday/doomsday-2.3.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake python-any-r1 qmake-utils readme.gentoo-r1
-
-DESCRIPTION="A modern gaming engine for Doom, Heretic, and Hexen"
-HOMEPAGE="https://www.dengine.net"
-SRC_URI="https://downloads.sourceforge.net/project/deng/Doomsday%20Engine/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3+ LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="demo freedoom fluidsynth openal tools"
-
-RDEPEND="
-	dev-qt/qtcore:5=
-	dev-qt/qtgui:5=[-gles2-only]
-	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
-	fluidsynth? ( media-sound/fluidsynth:= )
-	openal? ( media-libs/openal )
-	tools? ( sys-libs/ncurses:0= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}
-	virtual/pkgconfig
-"
-PDEPEND="
-	demo? ( games-fps/doom-data )
-	freedoom? ( games-fps/freedoom )
-"
-
-S="${WORKDIR}/${P}/${PN}"
-
-DOC_CONTENTS="You need to copy Doom, Doom 2, Chex Quest, Heretic, Hexen, HexenDD, or Doom64 wads to a folder of your choice and then tell the game engine where that folder is. This is different to older versions, which had separate launchers for each game and required the files to be in a specific place."
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Fix QA warning for "installing to one or more unexpected paths"
-	sed -e "10s:/texc:/${PF}:" -i tools/texc/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DDENG_ASSIMP_EMBEDDED="OFF"
-		-DDENG_ENABLE_TOOLS="$(usex tools)"
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DQMAKE=$(qt5_get_bindir)/qmake
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if use tools; then
-		mv -v "${ED}"/usr/bin/md2tool{,.${PN}} || die
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if use tools; then
-		einfo "In order to prevent a file collision with games-fps/eduke32[tools],"
-		einfo "the utility md2tool has been renamed to md2tool.doomsday."
-	fi
-}
diff --git a/games-fps/doomsday/doomsday-2.1.1-r1.ebuild b/games-fps/doomsday/doomsday-2.3.1.ebuild
index fbb7fa20132f..aeac492a02a3 100644
--- a/games-fps/doomsday/doomsday-2.1.1-r1.ebuild
+++ b/games-fps/doomsday/doomsday-2.3.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake python-any-r1 qmake-utils readme.gentoo-r1
+inherit cmake python-any-r1 qmake-utils readme.gentoo-r1 xdg
 
 DESCRIPTION="A modern gaming engine for Doom, Heretic, and Hexen"
 HOMEPAGE="https://www.dengine.net"
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.sourceforge.net/project/deng/Doomsday%20Engine/${PV}/
 LICENSE="GPL-3+ LGPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="demo freedoom fluidsynth openal tools"
+IUSE="demo +display-mode freedoom fluidsynth openal tools"
 
 RDEPEND="
 	dev-qt/qtcore:5=
@@ -22,9 +22,14 @@ RDEPEND="
 	dev-qt/qtopengl:5=
 	dev-qt/qtwidgets:5=
 	dev-qt/qtx11extras:5=
-	media-libs/assimp
+	media-libs/assimp:=
 	net-misc/curl
 	sys-libs/zlib
+	x11-libs/libX11
+	display-mode? (
+		x11-libs/libXrandr
+		x11-libs/libXxf86vm
+	)
 	fluidsynth? ( media-sound/fluidsynth:= )
 	openal? ( media-libs/openal )
 	tools? ( sys-libs/ncurses:0= )
@@ -51,8 +56,9 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DDENG_ASSIMP_EMBEDDED="OFF"
-		-DDENG_ENABLE_TOOLS="$(usex tools)"
+		-DDENG_ASSIMP_EMBEDDED=OFF
+		-DDENG_ENABLE_DISPLAYMODE=$(usex display-mode)
+		-DDENG_ENABLE_TOOLS=$(usex tools)
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 		-DQMAKE=$(qt5_get_bindir)/qmake
 	)
@@ -70,6 +76,7 @@ src_install() {
 }
 
 pkg_postinst() {
+	xdg_pkg_postinst
 	readme.gentoo_print_elog
 
 	if use tools; then
diff --git a/games-fps/doomsday/metadata.xml b/games-fps/doomsday/metadata.xml
index 52b4b361d50c..40cf9e97525a 100644
--- a/games-fps/doomsday/metadata.xml
+++ b/games-fps/doomsday/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="demo">Install launcher dor doom1.wad from <pkg>games-fps/doom-data</pkg></flag>
+		<flag name="display-mode">Include the ability to set the display mode</flag>
 		<flag name="fluidsynth">Build the FluidSynth sound driver</flag>
 		<flag name="freedoom">Install launcher for doom1.wad from <pkg>games-fps/freedoom</pkg></flag>
 		<flag name="tools">Build additional tools such as doomsday-shell, md2tool and texc</flag>