gentoo resync : 22.01.2021

3 files changed, 86 insertions, 3 deletions

diff --git a/games-fps/doomsday/Manifest b/games-fps/doomsday/Manifest
index 9689b64de99f..823ea1c6ccd2 100644
--- a/games-fps/doomsday/Manifest
+++ b/games-fps/doomsday/Manifest
@@ -1,3 +1,5 @@
 DIST doomsday-2.1.1.tar.gz 47526008 BLAKE2B bf941048d160058273df09d67b09e140c10d141cd73ff56d0f3162045696d81533aba9a8c9ff39fc29530248ee8b2f6dd2b3da76a929fb6263c311e65bcbdd82 SHA512 9df0afa0465ef3c3bb30cccf8ca51596e8e6e5584775a695c9c3278f15bcf7e9f7aaeaa0917f0a1de9fbb1174f2ae83a1ee85fba63bef6e49be957836f1107a3
-EBUILD doomsday-2.1.1-r1.ebuild 2045 BLAKE2B 3f48f09f357c53fe7c0e96c85d747ef1211b0aa26a8ceca561ea4611c15d4a21a747a3b623ed2a35749be0b1f4fe4f04dd9870b7172b02a995c84d2f457690d1 SHA512 fe309cf8aa0c04651587496bae8d7cccf9234aec68fb2b43a2d6c0f87b79e68f9f33c51c98ee3589f108bc8bf44576a48ca3365884fff8e702f23da5307902c4
+DIST doomsday-2.3.0.tar.gz 47838189 BLAKE2B 807204cd5e716f57291e383b6a2f0570c01f3e4a92d575f5e585cf1e793785031edd845399dd6896766b1c77425b2fefd6f5f5913adc5fcb7bb1415b2f906c98 SHA512 46d92743e981804eca3ed6e486c4a748114621053d6269a0c0bc5fa84a591f6556ad3226ab6fb3cbc8642ac2f128885261c0bdc78bb5f2012a25f2cab6413461
+EBUILD doomsday-2.1.1-r1.ebuild 2049 BLAKE2B 43dd6207986857887d73c2a9d4504701df1aec8894a2e582df6f3aad16be0941cb964e0ec0ae33220701ca73bdcf8a0ae07717b9206779f3b44ebe6e35d8c9e5 SHA512 2419f7fdf37a2f1aa635963a235f8b119cac60ba0340884ba7c45589875659c19e6a6702a5fbf45c65d97c0976bfa2b1a2ddf03bbd429d85553e576dfc52f701
+EBUILD doomsday-2.3.0.ebuild 2049 BLAKE2B 43dd6207986857887d73c2a9d4504701df1aec8894a2e582df6f3aad16be0941cb964e0ec0ae33220701ca73bdcf8a0ae07717b9206779f3b44ebe6e35d8c9e5 SHA512 2419f7fdf37a2f1aa635963a235f8b119cac60ba0340884ba7c45589875659c19e6a6702a5fbf45c65d97c0976bfa2b1a2ddf03bbd429d85553e576dfc52f701
 MISC metadata.xml 771 BLAKE2B 8a5effc2f449a9b4448dead1a37e9df047ae2e1608c26522d99b02e2d9561e8c129dbdb93f5a713dce72cee09edd8eaed61f38a278d995b3a7fc7e1a5c468bed SHA512 8bc89aa4bab55338472489ec1e92b47cb676b3110a1d3609d8e5a0d51965955770f045405665bff2e401f34697ef4d4b52341a668d08909a92db8eb660c18e00
diff --git a/games-fps/doomsday/doomsday-2.1.1-r1.ebuild b/games-fps/doomsday/doomsday-2.1.1-r1.ebuild
index 8aa9456f5752..47cd24259c18 100644
--- a/games-fps/doomsday/doomsday-2.1.1-r1.ebuild
+++ b/games-fps/doomsday/doomsday-2.1.1-r1.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_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit cmake python-any-r1 qmake-utils readme.gentoo-r1
 
diff --git a/games-fps/doomsday/doomsday-2.3.0.ebuild b/games-fps/doomsday/doomsday-2.3.0.ebuild
new file mode 100644
index 000000000000..47cd24259c18
--- /dev/null
+++ b/games-fps/doomsday/doomsday-2.3.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+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 fmod 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
+	fmod? ( media-libs/fmod:1 )
+	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
+}