[gentoo-commits] repo/gentoo:master commit in: games-fps/doomsday/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: games-fps/doomsday/
@ 2018-04-29 17:13 Pacho Ramos
  0 siblings, 0 replies; 36+ messages in thread
From: Pacho Ramos @ 2018-04-29 17:13 UTC (permalink / raw
  To: gentoo-commits

commit:     7537862d4fee658321df54d024fad58ac0eb04c1
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 29 17:04:05 2018 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Apr 29 17:13:13 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7537862d

games-fps/doomsday: Version bump (#617908)

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 games-fps/doomsday/Manifest              |  1 +
 games-fps/doomsday/doomsday-2.0.3.ebuild | 78 ++++++++++++++++++++++++++++++++
 games-fps/doomsday/metadata.xml          |  1 +
 3 files changed, 80 insertions(+)

diff --git a/games-fps/doomsday/Manifest b/games-fps/doomsday/Manifest
index 372f23582e0..7d8cb7b307b 100644
--- a/games-fps/doomsday/Manifest
+++ b/games-fps/doomsday/Manifest
@@ -1 +1,2 @@
+DIST doomsday-2.0.3.tar.gz 18060670 BLAKE2B e01545f5d719310a78f01de77249a72f9c3c61a1d295ee0827475439b63653f613660bdc033c1651180cc390469c89120d262c15c6e22cece52600e2889e1437 SHA512 4f8e737df9e004cf3ac3cf16b84ffce0c85e2180af552bac41a224595c7f6932397c39f7d3e9fa522e1ae62828cb87f564a5fa411e742eb07bbee96f14c3ee7c
 DIST doomsday-stable-1.15.8.tar.gz 52054238 BLAKE2B ab33c197a89c5b3a9aa00628cd88edb5b5d2c1116ed72c55f34bd21e8128b6ff056bbc81900a9ea133b2230319e3c0f7ef79df98609980a59dc1f3da41e2195d SHA512 6d1b86c6e364cbd043b0714eb351113c8bbaf98daddde1bf615fe663c15a763e26d3e478d1adeb6d8a75ed4c89a5a19f3a891e12ea5937ff2fc54b84118f642c

diff --git a/games-fps/doomsday/doomsday-2.0.3.ebuild b/games-fps/doomsday/doomsday-2.0.3.ebuild
new file mode 100644
index 00000000000..8e474baec7f
--- /dev/null
+++ b/games-fps/doomsday/doomsday-2.0.3.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-r1 readme.gentoo-r1 cmake-utils
+
+DESCRIPTION="A modern gaming engine for Doom, Heretic, and Hexen"
+HOMEPAGE="http://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 ~x86"
+
+IUSE="fluidsynth openal +doom demo freedoom heretic hexen tools fmod"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+        demo? ( doom ) freedoom? ( doom )
+"
+
+RDEPEND="
+	>=dev-util/cmake-3.1
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtgui:5[-gles2]
+	dev-qt/qtcore:5
+	net-misc/curl
+	sys-libs/zlib
+	media-libs/assimp
+	fmod? ( media-libs/fmod )
+	fluidsynth? ( media-sound/fluidsynth )
+	openal? ( media-libs/openal )
+	tools? ( sys-libs/ncurses:0 )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+PDEPEND="
+	demo? ( games-fps/doom-data )
+	freedoom? ( games-fps/freedoom )
+"
+
+S="${WORKDIR}/${P}/${PN}"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+You need to copy Doom, Doom 2, Chex Quest, Heretic, Hexen, HexenDD,
+and Doom64 wads to a folder of your choice. Then configure in game
+engine where that folder is. This is different than old versions,
+which had centralized launchers for each game, and required the
+files to be in a specific place
+"
+
+internal_src_configure() {
+	export QT_SELECT=qt5
+	local mycmakeargs=(
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DDENG_ASSIMP_EMBEDDED=off
+	)
+	cmake-utils_src_configure
+}
+
+src_configure() {
+	python_foreach_impl internal_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}

diff --git a/games-fps/doomsday/metadata.xml b/games-fps/doomsday/metadata.xml
index daf0c62634d..8c49e302718 100644
--- a/games-fps/doomsday/metadata.xml
+++ b/games-fps/doomsday/metadata.xml
@@ -9,6 +9,7 @@
 		<flag name="demo">Install launcher dor doom1.wad from <pkg>games-fps/doom-data</pkg></flag>
 		<flag name="doom">Install launcher for jdoom game</flag>
 		<flag name="fluidsynth">Build the FluidSynth sound driver</flag>
+		<flag name="fmod">Enable support for fmod music and sound effects lib</flag>
 		<flag name="freedoom">Install launcher for doom1.wad from <pkg>games-fps/freedoom</pkg></flag>
 		<flag name="heretic">Install launcher for jheretic game</flag>
 		<flag name="hexen">Install launcher for jhexen game</flag>


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/doomsday/
@ 2024-06-08  9:56 James Le Cuirot
  0 siblings, 0 replies; 36+ messages in thread
From: James Le Cuirot @ 2024-06-08  9:56 UTC (permalink / raw
  To: gentoo-commits

commit:     7e1654c2edd0756c712f2b6de9b5cfec904e693e
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  8 09:54:21 2024 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Jun  8 09:56:49 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e1654c2

games-fps/doomsday: Update PYTHON_COMPAT to python3_{10..13}

Closes: https://bugs.gentoo.org/896958
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-fps/doomsday/doomsday-2.3.1.ebuild | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/games-fps/doomsday/doomsday-2.3.1.ebuild b/games-fps/doomsday/doomsday-2.3.1.ebuild
index 26cd12c34b90..c74d3513f98d 100644
--- a/games-fps/doomsday/doomsday-2.3.1.ebuild
+++ b/games-fps/doomsday/doomsday-2.3.1.ebuild
@@ -3,13 +3,13 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{10..13} )
 inherit cmake flag-o-matic python-any-r1 qmake-utils readme.gentoo-r1 xdg
 
 DESCRIPTION="A modern gaming engine for Doom, Heretic, and Hexen"
-HOMEPAGE="https://www.dengine.net"
+HOMEPAGE="https://dengine.net"
 SRC_URI="https://downloads.sourceforge.net/project/deng/Doomsday%20Engine/${PV}/${P}.tar.gz"
-
+S="${WORKDIR}/${P}/${PN}"
 LICENSE="GPL-3+ LGPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
@@ -43,8 +43,6 @@ PDEPEND="
 	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() {


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/doomsday/
@ 2024-03-25  9:21 Sam James
  0 siblings, 0 replies; 36+ messages in thread
From: Sam James @ 2024-03-25  9:21 UTC (permalink / raw
  To: gentoo-commits

commit:     e5cea88009bfbc8c36caaf3f56db60df7507996c
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Mon Mar 25 04:13:00 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 25 09:20:47 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5cea880

games-fps/doomsday: add github / bugs-to upstream metadata

This package has a well-rounded set of resources. Sourceforge for
release assets, github for git, redmine for tickets, a custom website
for a homepage. Make this a bit easier to follow.

Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-fps/doomsday/metadata.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/games-fps/doomsday/metadata.xml b/games-fps/doomsday/metadata.xml
index 40cf9e97525a..0b45508d1e96 100644
--- a/games-fps/doomsday/metadata.xml
+++ b/games-fps/doomsday/metadata.xml
@@ -14,5 +14,7 @@
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">deng</remote-id>
+		<remote-id type="github">skyjake/Doomsday-Engine</remote-id>
+		<bugs-to>https://tracker.dengine.net/projects/deng</bugs-to>
 	</upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/doomsday/
@ 2024-03-25  9:21 Sam James
  0 siblings, 0 replies; 36+ messages in thread
From: Sam James @ 2024-03-25  9:21 UTC (permalink / raw
  To: gentoo-commits

commit:     0012503b0da5ab81ce03243d03f4a14767ac76c4
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Mon Mar 25 04:35:23 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 25 09:20:48 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0012503b

games-fps/doomsday: mark as LTO-unsafe

Currently working on reporting an upstream bug. Four different websites
including sourceforge and github but the only place for submitting bugs
is a self-hosted redmine that has disabled registration.

Closes: https://bugs.gentoo.org/858743
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-fps/doomsday/doomsday-2.3.1.ebuild | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/games-fps/doomsday/doomsday-2.3.1.ebuild b/games-fps/doomsday/doomsday-2.3.1.ebuild
index e47741325506..26cd12c34b90 100644
--- a/games-fps/doomsday/doomsday-2.3.1.ebuild
+++ b/games-fps/doomsday/doomsday-2.3.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 PYTHON_COMPAT=( python3_{9..10} )
-inherit cmake python-any-r1 qmake-utils readme.gentoo-r1 xdg
+inherit cmake flag-o-matic python-any-r1 qmake-utils readme.gentoo-r1 xdg
 
 DESCRIPTION="A modern gaming engine for Doom, Heretic, and Hexen"
 HOMEPAGE="https://www.dengine.net"
@@ -55,6 +55,14 @@ src_prepare() {
 }
 
 src_configure() {
+	# -Werror=odr, -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/858743
+	#
+	# Currently working on reporting an upstream bug. Four different websites
+	# including sourceforge and github but the only place for submitting bugs
+	# is a self-hosted redmine that has disabled registration.
+	filter-lto
+
 	local mycmakeargs=(
 		-DDENG_ASSIMP_EMBEDDED=OFF
 		-DDENG_ENABLE_DISPLAYMODE=$(usex display-mode)


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/doomsday/
@ 2023-12-19  5:19 Sam James
  0 siblings, 0 replies; 36+ messages in thread
From: Sam James @ 2023-12-19  5:19 UTC (permalink / raw
  To: gentoo-commits

commit:     d12e77cfe95d97789494fc688fc4477a3589a37b
Author:     Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Tue Dec 19 00:45:23 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 19 05:17:35 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d12e77cf

games-fps/doomsday: Keyword 2.3.1 ppc64, #849866

Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-fps/doomsday/doomsday-2.3.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-fps/doomsday/doomsday-2.3.1.ebuild b/games-fps/doomsday/doomsday-2.3.1.ebuild
index 85cb6a73b906..e47741325506 100644
--- a/games-fps/doomsday/doomsday-2.3.1.ebuild
+++ b/games-fps/doomsday/doomsday-2.3.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.sourceforge.net/project/deng/Doomsday%20Engine/${PV}/
 
 LICENSE="GPL-3+ LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="demo +display-mode freedoom fluidsynth openal tools"
 
 RDEPEND="


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/doomsday/
@ 2022-09-19  6:42 Michał Górny
  0 siblings, 0 replies; 36+ messages in thread
From: Michał Górny @ 2022-09-19  6:42 UTC (permalink / raw
  To: gentoo-commits

commit:     b1884644862aa6252fd718bd368b61b627c2b695
Author:     matoro <matoro <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Mon Sep 19 01:09:02 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Sep 19 06:42:12 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1884644

games-fps/doomsday: Keyword 2.3.1 arm64, #849866

Signed-off-by: matoro <matoro <AT> users.noreply.github.com>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 games-fps/doomsday/doomsday-2.3.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-fps/doomsday/doomsday-2.3.1.ebuild b/games-fps/doomsday/doomsday-2.3.1.ebuild
index aeac492a02a3..ac4626224da5 100644
--- a/games-fps/doomsday/doomsday-2.3.1.ebuild
+++ b/games-fps/doomsday/doomsday-2.3.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.sourceforge.net/project/deng/Doomsday%20Engine/${PV}/
 
 LICENSE="GPL-3+ LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="demo +display-mode freedoom fluidsynth openal tools"
 
 RDEPEND="


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/doomsday/
@ 2022-06-07 23:07 James Le Cuirot
  0 siblings, 0 replies; 36+ messages in thread
From: James Le Cuirot @ 2022-06-07 23:07 UTC (permalink / raw
  To: gentoo-commits

commit:     adb1d9c09ec0274c7c00e52a4b1624ca5d4f0bdd
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  7 23:05:24 2022 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Jun  7 23:06:38 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adb1d9c0

games-fps/doomsday: Drop old 2.1.1 and 2.3.0

Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-fps/doomsday/Manifest                 |  2 -
 games-fps/doomsday/doomsday-2.1.1-r2.ebuild | 79 -----------------------------
 games-fps/doomsday/doomsday-2.3.0-r1.ebuild | 79 -----------------------------
 3 files changed, 160 deletions(-)

diff --git a/games-fps/doomsday/Manifest b/games-fps/doomsday/Manifest
index dd76ef921b47..861c3c165935 100644
--- a/games-fps/doomsday/Manifest
+++ b/games-fps/doomsday/Manifest
@@ -1,3 +1 @@
-DIST doomsday-2.1.1.tar.gz 47526008 BLAKE2B bf941048d160058273df09d67b09e140c10d141cd73ff56d0f3162045696d81533aba9a8c9ff39fc29530248ee8b2f6dd2b3da76a929fb6263c311e65bcbdd82 SHA512 9df0afa0465ef3c3bb30cccf8ca51596e8e6e5584775a695c9c3278f15bcf7e9f7aaeaa0917f0a1de9fbb1174f2ae83a1ee85fba63bef6e49be957836f1107a3
-DIST doomsday-2.3.0.tar.gz 47838189 BLAKE2B 807204cd5e716f57291e383b6a2f0570c01f3e4a92d575f5e585cf1e793785031edd845399dd6896766b1c77425b2fefd6f5f5913adc5fcb7bb1415b2f906c98 SHA512 46d92743e981804eca3ed6e486c4a748114621053d6269a0c0bc5fa84a591f6556ad3226ab6fb3cbc8642ac2f128885261c0bdc78bb5f2012a25f2cab6413461
 DIST doomsday-2.3.1.tar.gz 47840812 BLAKE2B 5a45c9e0f781f0cc67367c703504568ee7f7cd0a96c57266ccf6bfbdf0d1e4ef838b2605b7dcecafe91f18d29c40ddbf9f6b5b0c049e94a95ce9fbbba4bddd1a SHA512 ca952fe0191529fe1192b16331d6c17d14e106f2366f5517177e51fdb50ea32baa2bf70d22bde5946101fac2926333fce6a8a317bc662df9f7662c5e023a669c

diff --git a/games-fps/doomsday/doomsday-2.1.1-r2.ebuild b/games-fps/doomsday/doomsday-2.1.1-r2.ebuild
deleted file mode 100644
index 415c0e4d885c..000000000000
--- a/games-fps/doomsday/doomsday-2.1.1-r2.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.3.0-r1.ebuild b/games-fps/doomsday/doomsday-2.3.0-r1.ebuild
deleted file mode 100644
index 415c0e4d885c..000000000000
--- a/games-fps/doomsday/doomsday-2.3.0-r1.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
-}


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/doomsday/
@ 2022-06-07 23:07 James Le Cuirot
  0 siblings, 0 replies; 36+ messages in thread
From: James Le Cuirot @ 2022-06-07 23:07 UTC (permalink / raw
  To: gentoo-commits

commit:     a1ef6e8ff1c92a14f1b2b6c95437332360c12691
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  7 23:04:48 2022 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Jun  7 23:06:35 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1ef6e8f

games-fps/doomsday: Bump to 2.3.1, EAPI 8, fix missing deps

Closes: https://bugs.gentoo.org/830496
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-fps/doomsday/Manifest              |  1 +
 games-fps/doomsday/doomsday-2.3.1.ebuild | 86 ++++++++++++++++++++++++++++++++
 games-fps/doomsday/metadata.xml          |  1 +
 3 files changed, 88 insertions(+)

diff --git a/games-fps/doomsday/Manifest b/games-fps/doomsday/Manifest
index e6ef0b454e32..dd76ef921b47 100644
--- a/games-fps/doomsday/Manifest
+++ b/games-fps/doomsday/Manifest
@@ -1,2 +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
+DIST doomsday-2.3.1.tar.gz 47840812 BLAKE2B 5a45c9e0f781f0cc67367c703504568ee7f7cd0a96c57266ccf6bfbdf0d1e4ef838b2605b7dcecafe91f18d29c40ddbf9f6b5b0c049e94a95ce9fbbba4bddd1a SHA512 ca952fe0191529fe1192b16331d6c17d14e106f2366f5517177e51fdb50ea32baa2bf70d22bde5946101fac2926333fce6a8a317bc662df9f7662c5e023a669c

diff --git a/games-fps/doomsday/doomsday-2.3.1.ebuild b/games-fps/doomsday/doomsday-2.3.1.ebuild
new file mode 100644
index 000000000000..aeac492a02a3
--- /dev/null
+++ b/games-fps/doomsday/doomsday-2.3.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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"
+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 +display-mode 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
+	x11-libs/libX11
+	display-mode? (
+		x11-libs/libXrandr
+		x11-libs/libXxf86vm
+	)
+	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_DISPLAYMODE=$(usex display-mode)
+		-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() {
+	xdg_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/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>


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/doomsday/
@ 2022-06-03 12:34 Joonas Niilola
  0 siblings, 0 replies; 36+ messages in thread
From: Joonas Niilola @ 2022-06-03 12:34 UTC (permalink / raw
  To: gentoo-commits

commit:     5e923779b5977ce3c6f3b85b981364be7915a2a4
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  3 12:32:30 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Jun  3 12:34:51 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e923779

games-fps/doomsday: subslot binder media-libs/assimp:=

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 .../doomsday/{doomsday-2.1.1-r1.ebuild => doomsday-2.1.1-r2.ebuild}     | 2 +-
 games-fps/doomsday/{doomsday-2.3.0.ebuild => doomsday-2.3.0-r1.ebuild}  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-fps/doomsday/doomsday-2.1.1-r1.ebuild b/games-fps/doomsday/doomsday-2.1.1-r2.ebuild
similarity index 98%
rename from games-fps/doomsday/doomsday-2.1.1-r1.ebuild
rename to games-fps/doomsday/doomsday-2.1.1-r2.ebuild
index fbb7fa20132f..415c0e4d885c 100644
--- a/games-fps/doomsday/doomsday-2.1.1-r1.ebuild
+++ b/games-fps/doomsday/doomsday-2.1.1-r2.ebuild
@@ -22,7 +22,7 @@ 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
 	fluidsynth? ( media-sound/fluidsynth:= )

diff --git a/games-fps/doomsday/doomsday-2.3.0.ebuild b/games-fps/doomsday/doomsday-2.3.0-r1.ebuild
similarity index 98%
rename from games-fps/doomsday/doomsday-2.3.0.ebuild
rename to games-fps/doomsday/doomsday-2.3.0-r1.ebuild
index fbb7fa20132f..415c0e4d885c 100644
--- a/games-fps/doomsday/doomsday-2.3.0.ebuild
+++ b/games-fps/doomsday/doomsday-2.3.0-r1.ebuild
@@ -22,7 +22,7 @@ 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
 	fluidsynth? ( media-sound/fluidsynth:= )


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/doomsday/
@ 2022-02-11 23:16 Ionen Wolkens
  0 siblings, 0 replies; 36+ messages in thread
From: Ionen Wolkens @ 2022-02-11 23:16 UTC (permalink / raw
  To: gentoo-commits

commit:     2e041b2c5eaa998db4d0582a74b7168d07862b18
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 11 21:38:35 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Feb 11 23:13:57 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e041b2c

games-fps/doomsday: enable py3.10

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-fps/doomsday/doomsday-2.1.1-r1.ebuild | 5 ++---
 games-fps/doomsday/doomsday-2.3.0.ebuild    | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/games-fps/doomsday/doomsday-2.1.1-r1.ebuild b/games-fps/doomsday/doomsday-2.1.1-r1.ebuild
index 8b9bca7a3b92..fbb7fa20132f 100644
--- a/games-fps/doomsday/doomsday-2.1.1-r1.ebuild
+++ b/games-fps/doomsday/doomsday-2.1.1-r1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 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..10} )
 inherit cmake python-any-r1 qmake-utils readme.gentoo-r1
 
 DESCRIPTION="A modern gaming engine for Doom, Heretic, and Hexen"

diff --git a/games-fps/doomsday/doomsday-2.3.0.ebuild b/games-fps/doomsday/doomsday-2.3.0.ebuild
index 8b9bca7a3b92..fbb7fa20132f 100644
--- a/games-fps/doomsday/doomsday-2.3.0.ebuild
+++ b/games-fps/doomsday/doomsday-2.3.0.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 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..10} )
 inherit cmake python-any-r1 qmake-utils readme.gentoo-r1
 
 DESCRIPTION="A modern gaming engine for Doom, Heretic, and Hexen"


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/doomsday/
@ 2021-03-06  2:34 Sam James
  0 siblings, 0 replies; 36+ messages in thread
From: Sam James @ 2021-03-06  2:34 UTC (permalink / raw
  To: gentoo-commits

commit:     6ef3c2ed482037b04bd6c49aacf15bb095119f24
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  6 02:34:45 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar  6 02:34:45 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ef3c2ed

games-fps/doomsday: fix UnusedLocalUse

Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-fps/doomsday/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/games-fps/doomsday/metadata.xml b/games-fps/doomsday/metadata.xml
index 0efa03a4eb6..0b17909c6cb 100644
--- a/games-fps/doomsday/metadata.xml
+++ b/games-fps/doomsday/metadata.xml
@@ -8,7 +8,6 @@
 	<use>
 		<flag name="demo">Install launcher dor doom1.wad from <pkg>games-fps/doom-data</pkg></flag>
 		<flag name="fluidsynth">Build the FluidSynth sound driver</flag>
-		<flag name="fmod">Enable support for fmod music and sound effects lib</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>
 	</use>


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/doomsday/
@ 2021-03-06  2:34 Sam James
  0 siblings, 0 replies; 36+ messages in thread
From: Sam James @ 2021-03-06  2:34 UTC (permalink / raw
  To: gentoo-commits

commit:     818b26646e17dcd8e75db415f195b292b991924a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  6 02:32:59 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar  6 02:34:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=818b2664

games-fps/doomsday: drop fmod

Fixes: 1993bdc5ea98ccc10e7092e8ccc40dec45d5464c
Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-fps/doomsday/doomsday-2.1.1-r1.ebuild | 3 +--
 games-fps/doomsday/doomsday-2.3.0.ebuild    | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/games-fps/doomsday/doomsday-2.1.1-r1.ebuild b/games-fps/doomsday/doomsday-2.1.1-r1.ebuild
index 5d0d361898a..8b9bca7a3b9 100644
--- a/games-fps/doomsday/doomsday-2.1.1-r1.ebuild
+++ b/games-fps/doomsday/doomsday-2.1.1-r1.ebuild
@@ -14,7 +14,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 fmod freedoom fluidsynth openal tools"
+IUSE="demo freedoom fluidsynth openal tools"
 
 RDEPEND="
 	dev-qt/qtcore:5=
@@ -26,7 +26,6 @@ RDEPEND="
 	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= )

diff --git a/games-fps/doomsday/doomsday-2.3.0.ebuild b/games-fps/doomsday/doomsday-2.3.0.ebuild
index 5d0d361898a..8b9bca7a3b9 100644
--- a/games-fps/doomsday/doomsday-2.3.0.ebuild
+++ b/games-fps/doomsday/doomsday-2.3.0.ebuild
@@ -14,7 +14,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 fmod freedoom fluidsynth openal tools"
+IUSE="demo freedoom fluidsynth openal tools"
 
 RDEPEND="
 	dev-qt/qtcore:5=
@@ -26,7 +26,6 @@ RDEPEND="
 	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= )


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/doomsday/
@ 2021-01-12 15:22 Sam James
  0 siblings, 0 replies; 36+ messages in thread
From: Sam James @ 2021-01-12 15:22 UTC (permalink / raw
  To: gentoo-commits

commit:     966ceefb3283f34d7f82fb5a92f5028e1dcc4834
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 12 15:20:14 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 12 15:22:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=966ceefb

games-fps/doomsday: bump to 2.3.0

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-fps/doomsday/Manifest              |  1 +
 games-fps/doomsday/doomsday-2.3.0.ebuild | 81 ++++++++++++++++++++++++++++++++
 2 files changed, 82 insertions(+)

diff --git a/games-fps/doomsday/Manifest b/games-fps/doomsday/Manifest
index 4726ace45e3..e6ef0b454e3 100644
--- a/games-fps/doomsday/Manifest
+++ b/games-fps/doomsday/Manifest
@@ -1 +1,2 @@
 DIST doomsday-2.1.1.tar.gz 47526008 BLAKE2B bf941048d160058273df09d67b09e140c10d141cd73ff56d0f3162045696d81533aba9a8c9ff39fc29530248ee8b2f6dd2b3da76a929fb6263c311e65bcbdd82 SHA512 9df0afa0465ef3c3bb30cccf8ca51596e8e6e5584775a695c9c3278f15bcf7e9f7aaeaa0917f0a1de9fbb1174f2ae83a1ee85fba63bef6e49be957836f1107a3
+DIST doomsday-2.3.0.tar.gz 47838189 BLAKE2B 807204cd5e716f57291e383b6a2f0570c01f3e4a92d575f5e585cf1e793785031edd845399dd6896766b1c77425b2fefd6f5f5913adc5fcb7bb1415b2f906c98 SHA512 46d92743e981804eca3ed6e486c4a748114621053d6269a0c0bc5fa84a591f6556ad3226ab6fb3cbc8642ac2f128885261c0bdc78bb5f2012a25f2cab6413461

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 00000000000..47cd24259c1
--- /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
+}


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/doomsday/
@ 2021-01-12 15:22 Sam James
  0 siblings, 0 replies; 36+ messages in thread
From: Sam James @ 2021-01-12 15:22 UTC (permalink / raw
  To: gentoo-commits

commit:     50f81b09ffb2ebc1b94ceedc763e77ad598b4426
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 12 13:54:05 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 12 15:22:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50f81b09

games-fps/doomsday: add Python 3.8, 3.9

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-fps/doomsday/doomsday-2.1.1-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-fps/doomsday/doomsday-2.1.1-r1.ebuild b/games-fps/doomsday/doomsday-2.1.1-r1.ebuild
index 8aa9456f575..47cd24259c1 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
 


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/doomsday/
@ 2020-11-22  0:12 Andreas Sturmlechner
  0 siblings, 0 replies; 36+ messages in thread
From: Andreas Sturmlechner @ 2020-11-22  0:12 UTC (permalink / raw
  To: gentoo-commits

commit:     d0031e9954e3c20500f025edd648fe0b929aec8f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 22 00:09:50 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 00:12:03 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0031e99

games-fps/doomsday: Set QMAKE directly w/ qmake-utils, drop QT_SELECT

Closes: https://bugs.gentoo.org/755974
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 games-fps/doomsday/doomsday-2.1.1-r1.ebuild | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/games-fps/doomsday/doomsday-2.1.1-r1.ebuild b/games-fps/doomsday/doomsday-2.1.1-r1.ebuild
index eb08301295e..8aa9456f575 100644
--- a/games-fps/doomsday/doomsday-2.1.1-r1.ebuild
+++ b/games-fps/doomsday/doomsday-2.1.1-r1.ebuild
@@ -5,11 +5,12 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7} )
 
-inherit cmake python-any-r1 readme.gentoo-r1
+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"
@@ -31,8 +32,7 @@ RDEPEND="
 	tools? ( sys-libs/ncurses:0= )
 "
 DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
+BDEPEND="${PYTHON_DEPS}
 	virtual/pkgconfig
 "
 PDEPEND="
@@ -52,11 +52,11 @@ src_prepare() {
 }
 
 src_configure() {
-	export QT_SELECT=qt5
 	local mycmakeargs=(
 		-DDENG_ASSIMP_EMBEDDED="OFF"
 		-DDENG_ENABLE_TOOLS="$(usex tools)"
 		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DQMAKE=$(qt5_get_bindir)/qmake
 	)
 	cmake_src_configure
 }


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/doomsday/
@ 2020-04-03 20:07 Andreas Sturmlechner
  0 siblings, 0 replies; 36+ messages in thread
From: Andreas Sturmlechner @ 2020-04-03 20:07 UTC (permalink / raw
  To: gentoo-commits

commit:     d2cbb7b0f69441a682f11e564836069f47db08c0
Author:     Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me>
AuthorDate: Fri Mar 27 03:25:27 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr  3 20:06:11 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2cbb7b0

games-fps/doomsday: dev-qt/qtgui[-gles2 => -gles2-only]

Signed-off-by: Haelwenn (lanodan) Monnier <contact <AT> hacktivis.me>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 games-fps/doomsday/{doomsday-2.1.1.ebuild => doomsday-2.1.1-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-fps/doomsday/doomsday-2.1.1.ebuild b/games-fps/doomsday/doomsday-2.1.1-r1.ebuild
similarity index 98%
rename from games-fps/doomsday/doomsday-2.1.1.ebuild
rename to games-fps/doomsday/doomsday-2.1.1-r1.ebuild
index fd675553b0f..eb08301295e 100644
--- a/games-fps/doomsday/doomsday-2.1.1.ebuild
+++ b/games-fps/doomsday/doomsday-2.1.1-r1.ebuild
@@ -17,7 +17,7 @@ IUSE="demo fmod freedoom fluidsynth openal tools"
 
 RDEPEND="
 	dev-qt/qtcore:5=
-	dev-qt/qtgui:5=[-gles2]
+	dev-qt/qtgui:5=[-gles2-only]
 	dev-qt/qtnetwork:5=
 	dev-qt/qtopengl:5=
 	dev-qt/qtwidgets:5=


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/doomsday/
@ 2019-09-15  9:17 Mikle Kolyada
  0 siblings, 0 replies; 36+ messages in thread
From: Mikle Kolyada @ 2019-09-15  9:17 UTC (permalink / raw
  To: gentoo-commits

commit:     4779594cc5605203300973e4ad66434ba96d90bb
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 15 09:17:03 2019 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Sep 15 09:17:03 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4779594c

games-fps/doomsday: Add ~arm keyword wrt bug #687800

Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="arm"
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 games-fps/doomsday/doomsday-2.1.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-fps/doomsday/doomsday-2.1.1.ebuild b/games-fps/doomsday/doomsday-2.1.1.ebuild
index fac61719195..757a7f8c472 100644
--- a/games-fps/doomsday/doomsday-2.1.1.ebuild
+++ b/games-fps/doomsday/doomsday-2.1.1.ebuild
@@ -12,7 +12,7 @@ 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 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="demo fmod freedoom fluidsynth openal tools"
 
 RDEPEND="


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/doomsday/
@ 2019-07-22  9:25 Michał Górny
  0 siblings, 0 replies; 36+ messages in thread
From: Michał Górny @ 2019-07-22  9:25 UTC (permalink / raw
  To: gentoo-commits

commit:     ca5cb95fc98ccd032c647d2f503e32035e3e31de
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 22 09:20:04 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jul 22 09:25:13 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca5cb95f

games-fps/doomsday: Drop old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 games-fps/doomsday/Manifest              |  1 -
 games-fps/doomsday/doomsday-2.0.3.ebuild | 77 --------------------------------
 games-fps/doomsday/metadata.xml          |  3 --
 3 files changed, 81 deletions(-)

diff --git a/games-fps/doomsday/Manifest b/games-fps/doomsday/Manifest
index 74d823a41cd..4726ace45e3 100644
--- a/games-fps/doomsday/Manifest
+++ b/games-fps/doomsday/Manifest
@@ -1,2 +1 @@
-DIST doomsday-2.0.3.tar.gz 18060670 BLAKE2B e01545f5d719310a78f01de77249a72f9c3c61a1d295ee0827475439b63653f613660bdc033c1651180cc390469c89120d262c15c6e22cece52600e2889e1437 SHA512 4f8e737df9e004cf3ac3cf16b84ffce0c85e2180af552bac41a224595c7f6932397c39f7d3e9fa522e1ae62828cb87f564a5fa411e742eb07bbee96f14c3ee7c
 DIST doomsday-2.1.1.tar.gz 47526008 BLAKE2B bf941048d160058273df09d67b09e140c10d141cd73ff56d0f3162045696d81533aba9a8c9ff39fc29530248ee8b2f6dd2b3da76a929fb6263c311e65bcbdd82 SHA512 9df0afa0465ef3c3bb30cccf8ca51596e8e6e5584775a695c9c3278f15bcf7e9f7aaeaa0917f0a1de9fbb1174f2ae83a1ee85fba63bef6e49be957836f1107a3

diff --git a/games-fps/doomsday/doomsday-2.0.3.ebuild b/games-fps/doomsday/doomsday-2.0.3.ebuild
deleted file mode 100644
index c50b22ad60e..00000000000
--- a/games-fps/doomsday/doomsday-2.0.3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1 readme.gentoo-r1 cmake-utils
-
-DESCRIPTION="A modern gaming engine for Doom, Heretic, and Hexen"
-HOMEPAGE="http://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 ~x86"
-
-IUSE="fluidsynth openal +doom demo freedoom heretic hexen tools fmod"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	demo? ( doom ) freedoom? ( doom )
-"
-
-RDEPEND="
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtgui:5[-gles2]
-	dev-qt/qtcore:5
-	net-misc/curl
-	sys-libs/zlib
-	media-libs/assimp
-	fmod? ( media-libs/fmod )
-	fluidsynth? ( media-sound/fluidsynth )
-	openal? ( media-libs/openal )
-	tools? ( sys-libs/ncurses:0 )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-"
-PDEPEND="
-	demo? ( games-fps/doom-data )
-	freedoom? ( games-fps/freedoom )
-"
-
-S="${WORKDIR}/${P}/${PN}"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-You need to copy Doom, Doom 2, Chex Quest, Heretic, Hexen, HexenDD,
-and Doom64 wads to a folder of your choice. Then configure in game
-engine where that folder is. This is different than old versions,
-which had centralized launchers for each game, and required the
-files to be in a specific place
-"
-
-internal_src_configure() {
-	export QT_SELECT=qt5
-	local mycmakeargs=(
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DDENG_ASSIMP_EMBEDDED=off
-	)
-	cmake-utils_src_configure
-}
-
-src_configure() {
-	python_foreach_impl internal_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}

diff --git a/games-fps/doomsday/metadata.xml b/games-fps/doomsday/metadata.xml
index 851017e48a8..0efa03a4eb6 100644
--- a/games-fps/doomsday/metadata.xml
+++ b/games-fps/doomsday/metadata.xml
@@ -7,12 +7,9 @@
 	</maintainer>
 	<use>
 		<flag name="demo">Install launcher dor doom1.wad from <pkg>games-fps/doom-data</pkg></flag>
-		<flag name="doom">Install launcher for jdoom game</flag>
 		<flag name="fluidsynth">Build the FluidSynth sound driver</flag>
 		<flag name="fmod">Enable support for fmod music and sound effects lib</flag>
 		<flag name="freedoom">Install launcher for doom1.wad from <pkg>games-fps/freedoom</pkg></flag>
-		<flag name="heretic">Install launcher for jheretic game</flag>
-		<flag name="hexen">Install launcher for jhexen game</flag>
 		<flag name="tools">Build additional tools such as doomsday-shell, md2tool and texc</flag>
 	</use>
 	<upstream>


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/doomsday/
@ 2019-05-04  9:14 James Le Cuirot
  0 siblings, 0 replies; 36+ messages in thread
From: James Le Cuirot @ 2019-05-04  9:14 UTC (permalink / raw
  To: gentoo-commits

commit:     a73bf107bb4061a37f33e4c55a93c3228f04ad5f
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat May  4 08:45:21 2019 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat May  4 09:14:03 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a73bf107

games-fps/doomsday: Rewrite the readme in better English

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-fps/doomsday/doomsday-2.1.1.ebuild | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/games-fps/doomsday/doomsday-2.1.1.ebuild b/games-fps/doomsday/doomsday-2.1.1.ebuild
index 5c8767fa7cf..fac61719195 100644
--- a/games-fps/doomsday/doomsday-2.1.1.ebuild
+++ b/games-fps/doomsday/doomsday-2.1.1.ebuild
@@ -42,15 +42,7 @@ PDEPEND="
 
 S="${WORKDIR}/${P}/${PN}"
 
-DISABLE_AUTOFORMATTING="yes"
-
-DOC_CONTENTS="
-You need to copy Doom, Doom 2, Chex Quest, Heretic, Hexen, HexenDD,
-and Doom64 wads to a folder of your choice. Then configure in game
-engine where that folder is. This is different than old versions,
-which had centralized launchers for each game, and required the
-files to be in a specific place
-"
+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-utils_src_prepare


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/doomsday/
@ 2019-05-04  9:14 James Le Cuirot
  0 siblings, 0 replies; 36+ messages in thread
From: James Le Cuirot @ 2019-05-04  9:14 UTC (permalink / raw
  To: gentoo-commits

commit:     637349b151f38ffdfaa707cffcb6c56404c5e70a
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat May  4 08:41:16 2019 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat May  4 09:13:59 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=637349b1

games-fps/doomsday: EAPI 7

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-fps/doomsday/doomsday-2.1.1.ebuild | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/games-fps/doomsday/doomsday-2.1.1.ebuild b/games-fps/doomsday/doomsday-2.1.1.ebuild
index 31b010dcafa..5c8767fa7cf 100644
--- a/games-fps/doomsday/doomsday-2.1.1.ebuild
+++ b/games-fps/doomsday/doomsday-2.1.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
@@ -30,8 +30,8 @@ RDEPEND="
 	openal? ( media-libs/openal )
 	tools? ( sys-libs/ncurses:0= )
 "
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	${PYTHON_DEPS}
 	virtual/pkgconfig
 "
@@ -53,7 +53,7 @@ files to be in a specific place
 "
 
 src_prepare() {
-	default
+	cmake-utils_src_prepare
 
 	# Fix QA warning for "installing to one or more unexpected paths"
 	sed -e "10s:/texc:/${PF}:" -i tools/texc/CMakeLists.txt || die
@@ -73,7 +73,7 @@ src_install() {
 	cmake-utils_src_install
 
 	if use tools; then
-		mv "${ED%/}"/usr/bin/md2tool "${ED%/}"/usr/bin/md2tool.doomsday || die
+		mv -v "${ED}"/usr/bin/md2tool{,.${PN}} || die
 	fi
 
 	readme.gentoo_create_doc


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/doomsday/
@ 2019-05-04  9:14 James Le Cuirot
  0 siblings, 0 replies; 36+ messages in thread
From: James Le Cuirot @ 2019-05-04  9:14 UTC (permalink / raw
  To: gentoo-commits

commit:     45262d83e54e9238c9ff488be26faf1c73e5a4ef
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat May  4 08:13:59 2019 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat May  4 09:13:48 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45262d83

games-fps/doomsday: Drop useless doom, heretic, and hexen USE flags

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-fps/doomsday/doomsday-2.1.1.ebuild | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/games-fps/doomsday/doomsday-2.1.1.ebuild b/games-fps/doomsday/doomsday-2.1.1.ebuild
index 596fda22640..10621fa54d9 100644
--- a/games-fps/doomsday/doomsday-2.1.1.ebuild
+++ b/games-fps/doomsday/doomsday-2.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,12 +15,8 @@ LICENSE="GPL-3+ LGPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="demo +doom fmod freedoom fluidsynth heretic hexen openal tools"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	demo? ( doom )
-	freedoom? ( doom )
-"
+IUSE="demo fmod freedoom fluidsynth openal tools"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
 	dev-qt/qtcore:5


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/doomsday/
@ 2019-05-04  9:14 James Le Cuirot
  0 siblings, 0 replies; 36+ messages in thread
From: James Le Cuirot @ 2019-05-04  9:14 UTC (permalink / raw
  To: gentoo-commits

commit:     e6bc6b47ba7d22ecda0c8e4cc7b54070a6f751ba
Author:     Conrad Kostecki <conrad <AT> kostecki <DOT> com>
AuthorDate: Fri May  3 21:21:25 2019 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat May  4 09:13:44 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6bc6b47

games-fps/doomsday: bump to version 2.1.1

Also fixed file collision with games-fps/eduke32[tools].

Closes: https://bugs.gentoo.org/684994
Package-Manager: Portage-2.3.65, Repoman-2.3.12
Signed-off-by: Conrad Kostecki <conrad <AT> kostecki.com>
Closes: https://github.com/gentoo/gentoo/pull/11888
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-fps/doomsday/Manifest              |   1 +
 games-fps/doomsday/doomsday-2.1.1.ebuild | 100 +++++++++++++++++++++++++++++++
 2 files changed, 101 insertions(+)

diff --git a/games-fps/doomsday/Manifest b/games-fps/doomsday/Manifest
index b063d3ba494..74d823a41cd 100644
--- a/games-fps/doomsday/Manifest
+++ b/games-fps/doomsday/Manifest
@@ -1 +1,2 @@
 DIST doomsday-2.0.3.tar.gz 18060670 BLAKE2B e01545f5d719310a78f01de77249a72f9c3c61a1d295ee0827475439b63653f613660bdc033c1651180cc390469c89120d262c15c6e22cece52600e2889e1437 SHA512 4f8e737df9e004cf3ac3cf16b84ffce0c85e2180af552bac41a224595c7f6932397c39f7d3e9fa522e1ae62828cb87f564a5fa411e742eb07bbee96f14c3ee7c
+DIST doomsday-2.1.1.tar.gz 47526008 BLAKE2B bf941048d160058273df09d67b09e140c10d141cd73ff56d0f3162045696d81533aba9a8c9ff39fc29530248ee8b2f6dd2b3da76a929fb6263c311e65bcbdd82 SHA512 9df0afa0465ef3c3bb30cccf8ca51596e8e6e5584775a695c9c3278f15bcf7e9f7aaeaa0917f0a1de9fbb1174f2ae83a1ee85fba63bef6e49be957836f1107a3

diff --git a/games-fps/doomsday/doomsday-2.1.1.ebuild b/games-fps/doomsday/doomsday-2.1.1.ebuild
new file mode 100644
index 00000000000..596fda22640
--- /dev/null
+++ b/games-fps/doomsday/doomsday-2.1.1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2019 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils python-r1 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 ~x86"
+
+IUSE="demo +doom fmod freedoom fluidsynth heretic hexen openal tools"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	demo? ( doom )
+	freedoom? ( doom )
+"
+
+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 )
+	fluidsynth? ( media-sound/fluidsynth )
+	openal? ( media-libs/openal )
+	tools? ( sys-libs/ncurses:0 )
+"
+DEPEND="
+	${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+PDEPEND="
+	demo? ( games-fps/doom-data )
+	freedoom? ( games-fps/freedoom )
+"
+
+S="${WORKDIR}/${P}/${PN}"
+
+DISABLE_AUTOFORMATTING="yes"
+
+DOC_CONTENTS="
+You need to copy Doom, Doom 2, Chex Quest, Heretic, Hexen, HexenDD,
+and Doom64 wads to a folder of your choice. Then configure in game
+engine where that folder is. This is different than old versions,
+which had centralized launchers for each game, and required the
+files to be in a specific place
+"
+
+src_prepare() {
+	default
+
+	# Fix QA warning for "installing to one or more unexpected paths"
+	sed -e "10s:/texc:/${PF}:" -i tools/texc/CMakeLists.txt || die
+}
+
+internal_src_configure() {
+	export QT_SELECT=qt5
+	local mycmakeargs=(
+		-DDENG_ASSIMP_EMBEDDED="OFF"
+		-DDENG_ENABLE_TOOLS="$(usex tools)"
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+	)
+	cmake-utils_src_configure
+}
+
+src_configure() {
+	python_foreach_impl internal_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use tools; then
+		mv "${ED%/}"/usr/bin/md2tool "${ED%/}"/usr/bin/md2tool.doomsday || 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
+}


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/doomsday/
@ 2019-05-04  9:14 James Le Cuirot
  0 siblings, 0 replies; 36+ messages in thread
From: James Le Cuirot @ 2019-05-04  9:14 UTC (permalink / raw
  To: gentoo-commits

commit:     95ee185b2a5731511d381803e9c269b523bbf8b1
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat May  4 08:38:41 2019 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat May  4 09:13:56 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95ee185b

games-fps/doomsday: Switch to python-any-r1 and allow Python 3

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-fps/doomsday/doomsday-2.1.1.ebuild | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/games-fps/doomsday/doomsday-2.1.1.ebuild b/games-fps/doomsday/doomsday-2.1.1.ebuild
index def51c66cb8..31b010dcafa 100644
--- a/games-fps/doomsday/doomsday-2.1.1.ebuild
+++ b/games-fps/doomsday/doomsday-2.1.1.ebuild
@@ -3,20 +3,17 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
-inherit cmake-utils python-r1 readme.gentoo-r1
+inherit cmake-utils python-any-r1 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 ~x86"
-
 IUSE="demo fmod freedoom fluidsynth openal tools"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
 	dev-qt/qtcore:5=
@@ -62,7 +59,7 @@ src_prepare() {
 	sed -e "10s:/texc:/${PF}:" -i tools/texc/CMakeLists.txt || die
 }
 
-internal_src_configure() {
+src_configure() {
 	export QT_SELECT=qt5
 	local mycmakeargs=(
 		-DDENG_ASSIMP_EMBEDDED="OFF"
@@ -72,10 +69,6 @@ internal_src_configure() {
 	cmake-utils_src_configure
 }
 
-src_configure() {
-	python_foreach_impl internal_src_configure
-}
-
 src_install() {
 	cmake-utils_src_install
 


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/doomsday/
@ 2019-05-04  9:14 James Le Cuirot
  0 siblings, 0 replies; 36+ messages in thread
From: James Le Cuirot @ 2019-05-04  9:14 UTC (permalink / raw
  To: gentoo-commits

commit:     b944d3108cff80d9390b9b3b8084fac165ff9ffd
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat May  4 08:16:09 2019 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat May  4 09:13:52 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b944d310

games-fps/doomsday: Add SLOT operators to some dependencies

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-fps/doomsday/doomsday-2.1.1.ebuild | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/games-fps/doomsday/doomsday-2.1.1.ebuild b/games-fps/doomsday/doomsday-2.1.1.ebuild
index 10621fa54d9..def51c66cb8 100644
--- a/games-fps/doomsday/doomsday-2.1.1.ebuild
+++ b/games-fps/doomsday/doomsday-2.1.1.ebuild
@@ -19,19 +19,19 @@ IUSE="demo fmod freedoom fluidsynth openal tools"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 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
+	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 )
-	fluidsynth? ( media-sound/fluidsynth )
+	fmod? ( media-libs/fmod:1 )
+	fluidsynth? ( media-sound/fluidsynth:= )
 	openal? ( media-libs/openal )
-	tools? ( sys-libs/ncurses:0 )
+	tools? ( sys-libs/ncurses:0= )
 "
 DEPEND="
 	${RDEPEND}


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/doomsday/
@ 2018-04-29 17:13 Pacho Ramos
  0 siblings, 0 replies; 36+ messages in thread
From: Pacho Ramos @ 2018-04-29 17:13 UTC (permalink / raw
  To: gentoo-commits

commit:     31bd7ef5e3bc88b5a5bef5db2df4999fd35389b7
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 29 17:07:15 2018 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Apr 29 17:13:15 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31bd7ef5

games-fps/doomsday: Drop old

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 games-fps/doomsday/Manifest               |   1 -
 games-fps/doomsday/doomsday-1.15.8.ebuild | 182 ------------------------------
 games-fps/doomsday/metadata.xml           |   2 -
 3 files changed, 185 deletions(-)

diff --git a/games-fps/doomsday/Manifest b/games-fps/doomsday/Manifest
index 7d8cb7b307b..b063d3ba494 100644
--- a/games-fps/doomsday/Manifest
+++ b/games-fps/doomsday/Manifest
@@ -1,2 +1 @@
 DIST doomsday-2.0.3.tar.gz 18060670 BLAKE2B e01545f5d719310a78f01de77249a72f9c3c61a1d295ee0827475439b63653f613660bdc033c1651180cc390469c89120d262c15c6e22cece52600e2889e1437 SHA512 4f8e737df9e004cf3ac3cf16b84ffce0c85e2180af552bac41a224595c7f6932397c39f7d3e9fa522e1ae62828cb87f564a5fa411e742eb07bbee96f14c3ee7c
-DIST doomsday-stable-1.15.8.tar.gz 52054238 BLAKE2B ab33c197a89c5b3a9aa00628cd88edb5b5d2c1116ed72c55f34bd21e8128b6ff056bbc81900a9ea133b2230319e3c0f7ef79df98609980a59dc1f3da41e2195d SHA512 6d1b86c6e364cbd043b0714eb351113c8bbaf98daddde1bf615fe663c15a763e26d3e478d1adeb6d8a75ed4c89a5a19f3a891e12ea5937ff2fc54b84118f642c

diff --git a/games-fps/doomsday/doomsday-1.15.8.ebuild b/games-fps/doomsday/doomsday-1.15.8.ebuild
deleted file mode 100644
index c2cadea8b25..00000000000
--- a/games-fps/doomsday/doomsday-1.15.8.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: fmod support broken (deng_fmod)
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit python-r1 eutils qmake-utils games
-
-DESCRIPTION="A modern gaming engine for Doom, Heretic, and Hexen"
-HOMEPAGE="http://www.dengine.net/"
-SRC_URI="mirror://sourceforge/deng/Doomsday%20Engine/${PV}/${PN}-stable-${PV}.tar.gz"
-
-LICENSE="GPL-3+ LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated fluidsynth openal snowberry +doom demo freedoom heretic hexen resources tools"
-# we need python at build time, so
-# snowberry? ( ${PYTHON_REQUIRED_USE} )
-# could break the build
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	demo? ( doom ) freedoom? ( doom ) resources? ( doom )"
-
-DEPEND="
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtgui:5[-gles2]
-	dev-qt/qtcore:5
-	net-misc/curl
-	sys-libs/zlib
-	media-libs/assimp
-	!dedicated? (
-		media-libs/libsdl2[joystick,sound]
-		media-libs/sdl2-mixer
-		media-libs/libpng:0
-		virtual/opengl
-		virtual/glu
-		x11-libs/libX11
-		x11-libs/libXrandr
-		x11-libs/libXxf86vm
-	)
-	fluidsynth? ( media-sound/fluidsynth )
-	openal? ( media-libs/openal )
-	tools? ( sys-libs/ncurses:0 )"
-RDEPEND="${DEPEND}
-	!dedicated? (
-		snowberry? (
-			${PYTHON_DEPS}
-			dev-lang/python-exec:2[${PYTHON_USEDEP}]
-			dev-python/wxpython[${PYTHON_USEDEP}]
-		)
-	)"
-DEPEND="${DEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig"
-PDEPEND="
-	!dedicated? (
-		demo? ( games-fps/doom-data )
-		freedoom? ( games-fps/freedoom )
-		resources? ( games-fps/doomsday-resources )
-	)"
-
-S=${WORKDIR}/${PN}-stable-${PV}/${PN}
-
-pkg_setup() {
-	games_pkg_setup
-	python_setup
-}
-
-src_prepare() {
-	sed -i \
-		-e '/readme.path/s#$$PREFIX#/usr#' \
-		client/client.pro server/server.pro || die
-
-	sed -i \
-		-e "/DENG_BASE_DIR =/s:\$\$PREFIX/share:${GAMES_DATADIR}:" \
-		config_unix.pri || die
-
-	{
-		echo "CONFIG += nostrip"
-		echo "PREFIX=${GAMES_PREFIX}"
-
-		if use dedicated ; then
-			echo "CONFIG += deng_noclient"
-			echo "CONFIG += deng_nosnowberry"
-		else
-			echo "CONFIG += deng_$(usex snowberry '' no)snowberry"
-		fi
-
-		use fluidsynth && echo "CONFIG += deng_fluidsynth"
-
-		use tools || echo "CONFIG += deng_notools"
-
-		use openal && echo "CONFIG += deng_openal"
-		true
-
-	} > config_user.pri || die
-}
-
-#Usage: doom_make_wrapper <name> <game> <icon> <desktop entry title> [args]
-doom_make_wrapper() {
-	local name=$1 game=$2 icon=$3 de_title=$4
-	shift 4
-	games_make_wrapper $name "doomsday -game ${game} $@"
-	make_desktop_entry $name "${de_title}" ${icon}
-}
-
-src_configure() {
-	eqmake5 doomsday.pro
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	dodoc "${S}"/../README.md
-
-	mv "${D}/${GAMES_DATADIR}"/{${PN}/data/jdoom,doom-data} || die
-	dosym "${GAMES_DATADIR}"/doom-data "${GAMES_DATADIR}"/${PN}/data/jdoom
-
-	if use !dedicated ; then
-		if use snowberry ; then
-			python_replicate_script "${D}"/"${GAMES_BINDIR}"/launch-doomsday
-
-			installmodules() {
-				# relocate snowberry module directory recursively into site-packages
-				python_domodule "${D}/${GAMES_DATADIR}"/${PN}/snowberry
-				# hack around improper path handling
-				sed -i \
-					-e "s:os.chdir.*$:os.chdir('$(python_get_sitedir)/snowberry'):" \
-					"${D%/}$(python_get_scriptdir)"/launch-doomsday || die
-			}
-			python_foreach_impl installmodules
-			# remove old module dir
-			rm -r "${D}/${GAMES_DATADIR}"/${PN}/snowberry || die
-
-			make_desktop_entry launch-doomsday "Snowberry DoomsDay" snowberry
-			doicon ../snowberry/graphics/snowberry.png
-		fi
-
-		if use doom; then
-			local res_arg
-
-			if use resources; then
-				res_arg="-def \"${GAMES_DATADIR}\"/${PN}/defs/jdoom/jDRP.ded"
-			fi
-
-			doicon ../snowberry/graphics/orb-doom.png
-			doom_make_wrapper jdoom doom1 orb-doom "DoomsDay Engine: Doom 1" "${res_arg}"
-			elog "Created jdoom launcher. To play Doom place your doom.wad to"
-			elog "\"${GAMES_DATADIR}\"/doom-data"
-			elog
-
-			if use demo; then
-				doom_make_wrapper jdoom-demo doom1-share orb-doom "DoomsDay Engine: Doom 1 Demo" \
-					"-iwad \"${GAMES_DATADIR}\"/doom-data/doom1.wad ${res_arg}"
-			fi
-			if use freedoom; then
-				doom_make_wrapper jdoom-freedoom doom1-share orb-doom "DoomsDay Engine: FreeDoom" \
-					"-iwad \"${GAMES_DATADIR}\"/doom-data/freedoom/doom1.wad"
-			fi
-		fi
-		if use hexen; then
-			doicon ../snowberry/graphics/orb-hexen.png
-			doom_make_wrapper jhexen hexen orb-hexen "DoomsDay Engine: Hexen"
-
-			elog "Created jhexen launcher. To play Hexen place your hexen.wad to"
-			elog "\"${GAMES_DATADIR}\"/${PN}/data/jhexen"
-			elog
-		fi
-		if use heretic; then
-			doicon ../snowberry/graphics/orb-heretic.png
-			doom_make_wrapper jheretic heretic orb-heretic "DoomsDay Engine: Heretic"
-
-			elog "Created jheretic launcher. To play Heretic place your heretic.wad to"
-			elog "\"${GAMES_DATADIR}\"/${PN}/data/jheretic"
-			elog
-		fi
-	fi
-
-	prepgamesdirs
-}

diff --git a/games-fps/doomsday/metadata.xml b/games-fps/doomsday/metadata.xml
index 8c49e302718..851017e48a8 100644
--- a/games-fps/doomsday/metadata.xml
+++ b/games-fps/doomsday/metadata.xml
@@ -13,8 +13,6 @@
 		<flag name="freedoom">Install launcher for doom1.wad from <pkg>games-fps/freedoom</pkg></flag>
 		<flag name="heretic">Install launcher for jheretic game</flag>
 		<flag name="hexen">Install launcher for jhexen game</flag>
-		<flag name="resources">Enable support for <pkg>games-fps/doomsday-resources</pkg> in jdoom launcher</flag>
-		<flag name="snowberry">Install Snowberry doomsday front-end</flag>
 		<flag name="tools">Build additional tools such as doomsday-shell, md2tool and texc</flag>
 	</use>
 	<upstream>


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/doomsday/
@ 2018-04-29 17:13 Pacho Ramos
  0 siblings, 0 replies; 36+ messages in thread
From: Pacho Ramos @ 2018-04-29 17:13 UTC (permalink / raw
  To: gentoo-commits

commit:     cff7153cbaf110015ae092e85703c63dc7c77980
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 29 17:05:31 2018 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Apr 29 17:13:14 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cff7153c

games-fps/doomsday: Make repoman more happy

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 games-fps/doomsday/doomsday-2.0.3.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/games-fps/doomsday/doomsday-2.0.3.ebuild b/games-fps/doomsday/doomsday-2.0.3.ebuild
index 8e474baec7f..c50b22ad60e 100644
--- a/games-fps/doomsday/doomsday-2.0.3.ebuild
+++ b/games-fps/doomsday/doomsday-2.0.3.ebuild
@@ -16,11 +16,10 @@ KEYWORDS="~amd64 ~x86"
 
 IUSE="fluidsynth openal +doom demo freedoom heretic hexen tools fmod"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
-        demo? ( doom ) freedoom? ( doom )
+	demo? ( doom ) freedoom? ( doom )
 "
 
 RDEPEND="
-	>=dev-util/cmake-3.1
 	dev-qt/qtnetwork:5
 	dev-qt/qtopengl:5
 	dev-qt/qtwidgets:5


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/doomsday/
@ 2016-11-03  9:14 Michael Palimaka
  0 siblings, 0 replies; 36+ messages in thread
From: Michael Palimaka @ 2016-11-03  9:14 UTC (permalink / raw
  To: gentoo-commits

commit:     67a9a69e18775464dbbd2067169f0b196e82e6f8
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  3 09:02:58 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Nov  3 09:14:41 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67a9a69e

games-fps/doomsday: remove old

Package-Manager: portage-2.3.2

 games-fps/doomsday/Manifest               |   1 -
 games-fps/doomsday/doomsday-1.14.5.ebuild | 186 ------------------------------
 2 files changed, 187 deletions(-)

diff --git a/games-fps/doomsday/Manifest b/games-fps/doomsday/Manifest
index 4f4d2c4..5e34795 100644
--- a/games-fps/doomsday/Manifest
+++ b/games-fps/doomsday/Manifest
@@ -1,2 +1 @@
-DIST doomsday-1.14.5.tar.gz 14081857 SHA256 019cd0cf89e69d80cd8f6fbbd3e3fd57b8ae4d0bcdf4285e8a71caad9f46417e SHA512 f8ecf7d213ab57081858226ab4078fcf8f250271be19a3ce5883c01e53c43b5c0e7afc16085703fe19c0cbccb795c7fd1b651e3efb8a8e854160131c6374cd9a WHIRLPOOL 2351129c6dba951ca4975e6f6e92d78c75ad3e8f9648e9129a9f5a3a22c295b25c4fdb87d5208b2d3fe9c0af94c4ff968730929fbc645da9171018a672cfc60e
 DIST doomsday-stable-1.15.8.tar.gz 52054238 SHA256 4c7b1dfdb7f0a44257f47322fe58fd1befba8dac10f44594e1be5dac582f43bf SHA512 6d1b86c6e364cbd043b0714eb351113c8bbaf98daddde1bf615fe663c15a763e26d3e478d1adeb6d8a75ed4c89a5a19f3a891e12ea5937ff2fc54b84118f642c WHIRLPOOL 0f660a430c4b036c92d02f5f84be16fb658b4963bcd694ca2cc92476218afcea367c7ff9d159b9cb63d753d5d10b443dbfdc0684c2c28ce78217d92764f7bdb5

diff --git a/games-fps/doomsday/doomsday-1.14.5.ebuild b/games-fps/doomsday/doomsday-1.14.5.ebuild
deleted file mode 100644
index a229a14..00000000
--- a/games-fps/doomsday/doomsday-1.14.5.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# TODO: fmod support broken (deng_fmod)
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit python-r1 confutils eutils qt4-r2 games
-
-DESCRIPTION="A modern gaming engine for Doom, Heretic, and Hexen"
-HOMEPAGE="http://www.dengine.net/"
-SRC_URI="mirror://sourceforge/deng/Doomsday%20Engine/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="dedicated fluidsynth openal snowberry +doom demo freedoom heretic hexen resources tools"
-# we need python at build time, so
-# snowberry? ( ${PYTHON_REQUIRED_USE} )
-# could break the build
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	demo? ( doom ) freedoom? ( doom ) resources? ( doom )"
-
-DEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtopengl:4
-	dev-qt/qtgui:4
-	net-misc/curl
-	sys-libs/zlib
-	!dedicated? (
-		media-libs/libsdl[joystick,sound]
-		media-libs/sdl-mixer
-		media-libs/libpng:0
-		virtual/opengl
-		virtual/glu
-		x11-libs/libX11
-		x11-libs/libXrandr
-		x11-libs/libXxf86vm
-	)
-	fluidsynth? ( media-sound/fluidsynth )
-	openal? ( media-libs/openal )
-	tools? ( sys-libs/ncurses:0 )"
-RDEPEND="${DEPEND}
-	!dedicated? (
-		snowberry? (
-			${PYTHON_DEPS}
-			dev-lang/python-exec:2[${PYTHON_USEDEP}]
-			dev-python/wxpython[${PYTHON_USEDEP}]
-		)
-	)"
-DEPEND="${DEPEND}
-	${PYTHON_DEPS}"
-PDEPEND="
-	!dedicated? (
-		demo? ( games-fps/doom-data )
-		freedoom? ( games-fps/freedoom )
-		resources? ( games-fps/doomsday-resources )
-	)"
-
-S=${S}/${PN}
-
-pkg_setup() {
-	games_pkg_setup
-	python_export_best
-}
-
-src_prepare() {
-	sed -i \
-		-e '/readme.path/s#$$PREFIX#/usr#' \
-		client/client.pro || die
-
-	sed -i \
-		-e "/^DENG_BASE_DIR =/s:\$\$PREFIX/share:${GAMES_DATADIR}:" \
-		config_unix.pri || die
-
-	echo "CONFIG += nostrip" > config_user.pri
-	echo "PREFIX=/usr/games" >> config_user.pri
-
-	if use dedicated ; then
-		echo "CONFIG += deng_noclient" >> config_user.pri
-		echo "CONFIG += deng_nosnowberry" >> config_user.pri
-	else
-		use snowberry &&
-			echo "CONFIG += deng_snowberry" >> config_user.pri || \
-			echo "CONFIG += deng_nosnowberry" >> config_user.pri
-	fi
-
-	use fluidsynth &&
-		echo "CONFIG += deng_fluidsynth" >> config_user.pri
-
-	use tools ||
-		echo "CONFIG += deng_notools" >> config_user.pri
-
-	if use openal; then
-		echo "CONFIG += deng_openal" >> config_user.pri
-		sed -i \
-			-e 's:\# Generic Unix.:LIBS += -lopenal:' \
-			dep_openal.pri || die
-	fi
-
-	qt4-r2_src_prepare
-}
-
-#Usage: doom_make_wrapper <name> <game> <icon> <desktop entry title> [args]
-doom_make_wrapper() {
-	local name=$1 game=$2 icon=$3 de_title=$4
-	shift 4
-	games_make_wrapper $name \
-		"doomsday -game ${game} $@"
-	make_desktop_entry $name "${de_title}" ${icon}
-}
-
-src_configure() {
-	qt4-r2_src_configure
-}
-
-src_install() {
-	qt4-r2_src_install
-
-	dodoc "${WORKDIR}"/${P}/README.md
-
-	mv "${D}/${GAMES_DATADIR}"/{${PN}/data/jdoom,doom-data} || die
-	dosym "${GAMES_DATADIR}"/doom-data "${GAMES_DATADIR}"/${PN}/data/jdoom
-
-	if use !dedicated ; then
-		if use snowberry ; then
-			python_replicate_script "${D}"/"${GAMES_BINDIR}"/launch-doomsday
-
-			installmodules() {
-				# relocate snowberry module directory recursively into site-packages
-				python_domodule "${D}/${GAMES_DATADIR}"/${PN}/snowberry
-				# hack around improper path handling
-				sed -i \
-					-e "s:os.chdir.*$:os.chdir('$(python_get_sitedir)/snowberry'):" \
-					"${D%/}$(python_get_scriptdir)"/launch-doomsday || die
-			}
-			python_foreach_impl installmodules
-			# remove old module dir
-			rm -r "${D}/${GAMES_DATADIR}"/${PN}/snowberry || die
-
-			make_desktop_entry launch-doomsday "Snowberry DoomsDay" snowberry
-			doicon ../snowberry/graphics/snowberry.png
-		fi
-
-		if use doom; then
-			local res_arg
-			if use resources; then
-				res_arg="-def \"${GAMES_DATADIR}\"/${PN}/defs/jdoom/jDRP.ded"
-			fi
-
-			doicon ../snowberry/graphics/orb-doom.png
-			doom_make_wrapper jdoom doom1 orb-doom "DoomsDay Engine: Doom 1" "${res_arg}"
-			elog "Created jdoom launcher. To play Doom place your doom.wad to"
-			elog "\"${GAMES_DATADIR}\"/doom-data"
-			elog
-
-			if use demo; then
-				doom_make_wrapper jdoom-demo doom1-share orb-doom "DoomsDay Engine: Doom 1 Demo" \
-					"-iwad \"${GAMES_DATADIR}\"/doom-data/doom1.wad ${res_arg}"
-			fi
-			if use freedoom; then
-				doom_make_wrapper jdoom-freedoom doom1-share orb-doom "DoomsDay Engine: FreeDoom" \
-					"-iwad \"${GAMES_DATADIR}\"/doom-data/freedoom/doom1.wad"
-			fi
-		fi
-		if use hexen; then
-			doicon ../snowberry/graphics/orb-hexen.png
-			doom_make_wrapper jhexen hexen orb-hexen "DoomsDay Engine: Hexen"
-
-			elog "Created jhexen launcher. To play Hexen place your hexen.wad to"
-			elog "\"${GAMES_DATADIR}\"/${PN}/data/jhexen"
-			elog
-		fi
-		if use heretic; then
-			doicon ../snowberry/graphics/orb-heretic.png
-			doom_make_wrapper jheretic heretic orb-heretic "DoomsDay Engine: Heretic"
-
-			elog "Created jheretic launcher. To play Heretic place your heretic.wad to"
-			elog "\"${GAMES_DATADIR}\"/${PN}/data/jheretic"
-			elog
-		fi
-	fi
-
-	prepgamesdirs
-}


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/doomsday/
@ 2016-11-03  9:14 Michael Palimaka
  0 siblings, 0 replies; 36+ messages in thread
From: Michael Palimaka @ 2016-11-03  9:14 UTC (permalink / raw
  To: gentoo-commits

commit:     1cfd3c14bfaeb43c26f0f538003721fe20dc814b
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  3 09:02:44 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Nov  3 09:14:41 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cfd3c14

games-fps/doomsday: x86 stable

Package-Manager: portage-2.3.2

 games-fps/doomsday/doomsday-1.15.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-fps/doomsday/doomsday-1.15.8.ebuild b/games-fps/doomsday/doomsday-1.15.8.ebuild
index 0090e09..7d7531a 100644
--- a/games-fps/doomsday/doomsday-1.15.8.ebuild
+++ b/games-fps/doomsday/doomsday-1.15.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/deng/Doomsday%20Engine/${PV}/${PN}-stable-${PV}.ta
 
 LICENSE="GPL-3+ LGPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="dedicated fluidsynth openal snowberry +doom demo freedoom heretic hexen resources tools"
 # we need python at build time, so
 # snowberry? ( ${PYTHON_REQUIRED_USE} )


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/doomsday/
@ 2016-05-09 18:11 Michael Sterrett
  0 siblings, 0 replies; 36+ messages in thread
From: Michael Sterrett @ 2016-05-09 18:11 UTC (permalink / raw
  To: gentoo-commits

commit:     f5bee3e69da931a3dd736b621b9ec82ec571828a
Author:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Mon May  9 18:10:45 2016 +0000
Commit:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Mon May  9 18:11:14 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5bee3e6

games-fps/doomsday: doomsday needs qtgui without gles2 (bug #572040)

Package-Manager: portage-2.2.26

 games-fps/doomsday/doomsday-1.15.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-fps/doomsday/doomsday-1.15.8.ebuild b/games-fps/doomsday/doomsday-1.15.8.ebuild
index ca0cd11..fa90bfd 100644
--- a/games-fps/doomsday/doomsday-1.15.8.ebuild
+++ b/games-fps/doomsday/doomsday-1.15.8.ebuild
@@ -27,7 +27,7 @@ DEPEND="
 	dev-qt/qtopengl:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
-	dev-qt/qtgui:5
+	dev-qt/qtgui:5[-gles2]
 	dev-qt/qtcore:5
 	net-misc/curl
 	sys-libs/zlib


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/doomsday/
@ 2016-04-20 15:17 Ian Stakenvicius
  0 siblings, 0 replies; 36+ messages in thread
From: Ian Stakenvicius @ 2016-04-20 15:17 UTC (permalink / raw
  To: gentoo-commits

commit:     85bede7d40de63fc41662bf0e19fea230b81a02d
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 20 15:17:05 2016 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Wed Apr 20 15:17:05 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85bede7d

games-fps/doomsday: fix <pkg/> references in metadata.xml

Package-Manager: portage-2.2.26

 games-fps/doomsday/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-fps/doomsday/metadata.xml b/games-fps/doomsday/metadata.xml
index aed055a..daf0c62 100644
--- a/games-fps/doomsday/metadata.xml
+++ b/games-fps/doomsday/metadata.xml
@@ -9,7 +9,7 @@
 		<flag name="demo">Install launcher dor doom1.wad from <pkg>games-fps/doom-data</pkg></flag>
 		<flag name="doom">Install launcher for jdoom game</flag>
 		<flag name="fluidsynth">Build the FluidSynth sound driver</flag>
-		<flag name="freedoom">Install launcher for doom1.wad from <pkg>games-fps/freefoom</pkg></flag>
+		<flag name="freedoom">Install launcher for doom1.wad from <pkg>games-fps/freedoom</pkg></flag>
 		<flag name="heretic">Install launcher for jheretic game</flag>
 		<flag name="hexen">Install launcher for jhexen game</flag>
 		<flag name="resources">Enable support for <pkg>games-fps/doomsday-resources</pkg> in jdoom launcher</flag>


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/doomsday/
@ 2016-04-07  3:23 Michael Sterrett
  0 siblings, 0 replies; 36+ messages in thread
From: Michael Sterrett @ 2016-04-07  3:23 UTC (permalink / raw
  To: gentoo-commits

commit:     f71073f9b3604f9c267bbebe5ecb111ce180b0e8
Author:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  7 03:22:45 2016 +0000
Commit:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Thu Apr  7 03:23:21 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f71073f9

games-fps/doomsday: version bump

Package-Manager: portage-2.2.26

 games-fps/doomsday/Manifest               |   1 +
 games-fps/doomsday/doomsday-1.15.8.ebuild | 183 ++++++++++++++++++++++++++++++
 2 files changed, 184 insertions(+)

diff --git a/games-fps/doomsday/Manifest b/games-fps/doomsday/Manifest
index 3d79526..e31f819 100644
--- a/games-fps/doomsday/Manifest
+++ b/games-fps/doomsday/Manifest
@@ -1,2 +1,3 @@
 DIST doomsday-1.14.5.tar.gz 14081857 SHA256 019cd0cf89e69d80cd8f6fbbd3e3fd57b8ae4d0bcdf4285e8a71caad9f46417e SHA512 f8ecf7d213ab57081858226ab4078fcf8f250271be19a3ce5883c01e53c43b5c0e7afc16085703fe19c0cbccb795c7fd1b651e3efb8a8e854160131c6374cd9a WHIRLPOOL 2351129c6dba951ca4975e6f6e92d78c75ad3e8f9648e9129a9f5a3a22c295b25c4fdb87d5208b2d3fe9c0af94c4ff968730929fbc645da9171018a672cfc60e
 DIST doomsday-stable-1.15.7.tar.gz 52055761 SHA256 9d833e458e72df7723b7a1b209cc53dc868d070ce7912a53c8c7887b1df933f3 SHA512 8b0ea09a46d88dd7bb8213878401d0eccca960ac08da1b77fb359f92b9a519b3e474007c5e0a42dd44684e909be529710be52b8fabbf62975536a99385fc4d66 WHIRLPOOL 78d40bb932072e2f3380f0a64f807d251ea64efe8e5eca0c7a3360b43be51988ea2b06264a7f7bd1c89e15c4d330dcba4a0c57b612f399a0e15c2c4567d14601
+DIST doomsday-stable-1.15.8.tar.gz 52054238 SHA256 4c7b1dfdb7f0a44257f47322fe58fd1befba8dac10f44594e1be5dac582f43bf SHA512 6d1b86c6e364cbd043b0714eb351113c8bbaf98daddde1bf615fe663c15a763e26d3e478d1adeb6d8a75ed4c89a5a19f3a891e12ea5937ff2fc54b84118f642c WHIRLPOOL 0f660a430c4b036c92d02f5f84be16fb658b4963bcd694ca2cc92476218afcea367c7ff9d159b9cb63d753d5d10b443dbfdc0684c2c28ce78217d92764f7bdb5

diff --git a/games-fps/doomsday/doomsday-1.15.8.ebuild b/games-fps/doomsday/doomsday-1.15.8.ebuild
new file mode 100644
index 0000000..ca0cd11
--- /dev/null
+++ b/games-fps/doomsday/doomsday-1.15.8.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# TODO: fmod support broken (deng_fmod)
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit python-r1 eutils qmake-utils games
+
+DESCRIPTION="A modern gaming engine for Doom, Heretic, and Hexen"
+HOMEPAGE="http://www.dengine.net/"
+SRC_URI="mirror://sourceforge/deng/Doomsday%20Engine/${PV}/${PN}-stable-${PV}.tar.gz"
+
+LICENSE="GPL-3+ LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dedicated fluidsynth openal snowberry +doom demo freedoom heretic hexen resources tools"
+# we need python at build time, so
+# snowberry? ( ${PYTHON_REQUIRED_USE} )
+# could break the build
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	demo? ( doom ) freedoom? ( doom ) resources? ( doom )"
+
+DEPEND="
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtgui:5
+	dev-qt/qtcore:5
+	net-misc/curl
+	sys-libs/zlib
+	media-libs/assimp
+	!dedicated? (
+		media-libs/libsdl2[joystick,sound]
+		media-libs/sdl2-mixer
+		media-libs/libpng:0
+		virtual/opengl
+		virtual/glu
+		x11-libs/libX11
+		x11-libs/libXrandr
+		x11-libs/libXxf86vm
+	)
+	fluidsynth? ( media-sound/fluidsynth )
+	openal? ( media-libs/openal )
+	tools? ( sys-libs/ncurses:0 )"
+RDEPEND="${DEPEND}
+	!dedicated? (
+		snowberry? (
+			${PYTHON_DEPS}
+			dev-lang/python-exec:2[${PYTHON_USEDEP}]
+			dev-python/wxpython[${PYTHON_USEDEP}]
+		)
+	)"
+DEPEND="${DEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig"
+PDEPEND="
+	!dedicated? (
+		demo? ( games-fps/doom-data )
+		freedoom? ( games-fps/freedoom )
+		resources? ( games-fps/doomsday-resources )
+	)"
+
+S=${WORKDIR}/${PN}-stable-${PV}/${PN}
+
+pkg_setup() {
+	games_pkg_setup
+	python_setup
+}
+
+src_prepare() {
+	sed -i \
+		-e '/readme.path/s#$$PREFIX#/usr#' \
+		client/client.pro server/server.pro || die
+
+	sed -i \
+		-e "/DENG_BASE_DIR =/s:\$\$PREFIX/share:${GAMES_DATADIR}:" \
+		config_unix.pri || die
+
+	{
+		echo "CONFIG += nostrip"
+		echo "PREFIX=${GAMES_PREFIX}"
+
+		if use dedicated ; then
+			echo "CONFIG += deng_noclient"
+			echo "CONFIG += deng_nosnowberry"
+		else
+			echo "CONFIG += deng_$(usex snowberry '' no)snowberry"
+		fi
+
+		use fluidsynth && echo "CONFIG += deng_fluidsynth"
+
+		use tools || echo "CONFIG += deng_notools"
+
+		use openal && echo "CONFIG += deng_openal"
+		true
+
+	} > config_user.pri || die
+}
+
+#Usage: doom_make_wrapper <name> <game> <icon> <desktop entry title> [args]
+doom_make_wrapper() {
+	local name=$1 game=$2 icon=$3 de_title=$4
+	shift 4
+	games_make_wrapper $name "doomsday -game ${game} $@"
+	make_desktop_entry $name "${de_title}" ${icon}
+}
+
+src_configure() {
+	eqmake5 doomsday.pro
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	dodoc "${S}"/../README.md
+
+	mv "${D}/${GAMES_DATADIR}"/{${PN}/data/jdoom,doom-data} || die
+	dosym "${GAMES_DATADIR}"/doom-data "${GAMES_DATADIR}"/${PN}/data/jdoom
+
+	if use !dedicated ; then
+		if use snowberry ; then
+			python_replicate_script "${D}"/"${GAMES_BINDIR}"/launch-doomsday
+
+			installmodules() {
+				# relocate snowberry module directory recursively into site-packages
+				python_domodule "${D}/${GAMES_DATADIR}"/${PN}/snowberry
+				# hack around improper path handling
+				sed -i \
+					-e "s:os.chdir.*$:os.chdir('$(python_get_sitedir)/snowberry'):" \
+					"${D%/}$(python_get_scriptdir)"/launch-doomsday || die
+			}
+			python_foreach_impl installmodules
+			# remove old module dir
+			rm -r "${D}/${GAMES_DATADIR}"/${PN}/snowberry || die
+
+			make_desktop_entry launch-doomsday "Snowberry DoomsDay" snowberry
+			doicon ../snowberry/graphics/snowberry.png
+		fi
+
+		if use doom; then
+			local res_arg
+
+			if use resources; then
+				res_arg="-def \"${GAMES_DATADIR}\"/${PN}/defs/jdoom/jDRP.ded"
+			fi
+
+			doicon ../snowberry/graphics/orb-doom.png
+			doom_make_wrapper jdoom doom1 orb-doom "DoomsDay Engine: Doom 1" "${res_arg}"
+			elog "Created jdoom launcher. To play Doom place your doom.wad to"
+			elog "\"${GAMES_DATADIR}\"/doom-data"
+			elog
+
+			if use demo; then
+				doom_make_wrapper jdoom-demo doom1-share orb-doom "DoomsDay Engine: Doom 1 Demo" \
+					"-iwad \"${GAMES_DATADIR}\"/doom-data/doom1.wad ${res_arg}"
+			fi
+			if use freedoom; then
+				doom_make_wrapper jdoom-freedoom doom1-share orb-doom "DoomsDay Engine: FreeDoom" \
+					"-iwad \"${GAMES_DATADIR}\"/doom-data/freedoom/doom1.wad"
+			fi
+		fi
+		if use hexen; then
+			doicon ../snowberry/graphics/orb-hexen.png
+			doom_make_wrapper jhexen hexen orb-hexen "DoomsDay Engine: Hexen"
+
+			elog "Created jhexen launcher. To play Hexen place your hexen.wad to"
+			elog "\"${GAMES_DATADIR}\"/${PN}/data/jhexen"
+			elog
+		fi
+		if use heretic; then
+			doicon ../snowberry/graphics/orb-heretic.png
+			doom_make_wrapper jheretic heretic orb-heretic "DoomsDay Engine: Heretic"
+
+			elog "Created jheretic launcher. To play Heretic place your heretic.wad to"
+			elog "\"${GAMES_DATADIR}\"/${PN}/data/jheretic"
+			elog
+		fi
+	fi
+
+	prepgamesdirs
+}


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/doomsday/
@ 2016-03-06 12:58 Agostino Sarubbo
  0 siblings, 0 replies; 36+ messages in thread
From: Agostino Sarubbo @ 2016-03-06 12:58 UTC (permalink / raw
  To: gentoo-commits

commit:     0e2bb4bb205749455f24b8df631d546678f17c07
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  6 12:57:15 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Mar  6 12:58:32 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e2bb4bb

games-fps/doomsday: amd64 stable wrt bug #574836

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 games-fps/doomsday/doomsday-1.15.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-fps/doomsday/doomsday-1.15.7.ebuild b/games-fps/doomsday/doomsday-1.15.7.ebuild
index cdd9e80..6e05e09 100644
--- a/games-fps/doomsday/doomsday-1.15.7.ebuild
+++ b/games-fps/doomsday/doomsday-1.15.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/deng/Doomsday%20Engine/${PV}/${PN}-stable-${PV}.ta
 
 LICENSE="GPL-3+ LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="dedicated fluidsynth openal snowberry +doom demo freedoom heretic hexen resources tools"
 # we need python at build time, so
 # snowberry? ( ${PYTHON_REQUIRED_USE} )


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/doomsday/
@ 2016-01-15 19:33 Michael Sterrett
  0 siblings, 0 replies; 36+ messages in thread
From: Michael Sterrett @ 2016-01-15 19:33 UTC (permalink / raw
  To: gentoo-commits

commit:     e2eedf20bb26e6ecf287f37389204d6cf1cd008e
Author:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 15 19:33:01 2016 +0000
Commit:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Fri Jan 15 19:33:30 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2eedf20

games-fps/doomsday: fix building with USE=-openal (bug #571982); add missing dep on dev-qt/qtnetwork (bug #571984)

Package-Manager: portage-2.2.26

 games-fps/doomsday/doomsday-1.15.7.ebuild | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/games-fps/doomsday/doomsday-1.15.7.ebuild b/games-fps/doomsday/doomsday-1.15.7.ebuild
index 1b11b67..cdd9e80 100644
--- a/games-fps/doomsday/doomsday-1.15.7.ebuild
+++ b/games-fps/doomsday/doomsday-1.15.7.ebuild
@@ -23,10 +23,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	demo? ( doom ) freedoom? ( doom ) resources? ( doom )"
 
 DEPEND="
-	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5
 	dev-qt/qtopengl:5
+	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	dev-qt/qtgui:5
+	dev-qt/qtcore:5
 	net-misc/curl
 	sys-libs/zlib
 	media-libs/assimp
@@ -93,6 +95,7 @@ src_prepare() {
 		use tools || echo "CONFIG += deng_notools"
 
 		use openal && echo "CONFIG += deng_openal"
+		true
 
 	} > config_user.pri || die
 }


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/doomsday/
@ 2016-01-14 21:28 Michael Sterrett
  0 siblings, 0 replies; 36+ messages in thread
From: Michael Sterrett @ 2016-01-14 21:28 UTC (permalink / raw
  To: gentoo-commits

commit:     ad3e10828457dbc034ace481c5bbf4b6caed8fa4
Author:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 14 21:11:07 2016 +0000
Commit:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Thu Jan 14 21:28:20 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad3e1082

games-fps/doomsday: use qmake-utils instead of qt5-build (bug #571918)

Package-Manager: portage-2.2.26

 games-fps/doomsday/doomsday-1.15.7.ebuild | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/games-fps/doomsday/doomsday-1.15.7.ebuild b/games-fps/doomsday/doomsday-1.15.7.ebuild
index b453730..1b11b67 100644
--- a/games-fps/doomsday/doomsday-1.15.7.ebuild
+++ b/games-fps/doomsday/doomsday-1.15.7.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
-inherit python-r1 eutils qt5-build games
+inherit python-r1 eutils qmake-utils games
 
 DESCRIPTION="A modern gaming engine for Doom, Heretic, and Hexen"
 HOMEPAGE="http://www.dengine.net/"
@@ -95,8 +95,6 @@ src_prepare() {
 		use openal && echo "CONFIG += deng_openal"
 
 	} > config_user.pri || die
-
-	qt5-build_src_prepare
 }
 
 #Usage: doom_make_wrapper <name> <game> <icon> <desktop entry title> [args]
@@ -108,12 +106,11 @@ doom_make_wrapper() {
 }
 
 src_configure() {
-	qt5-build_src_configure
+	eqmake5 doomsday.pro
 }
 
 src_install() {
-	qt5-build_src_install
-
+	emake INSTALL_ROOT="${D}" install
 	dodoc "${S}"/../README.md
 
 	mv "${D}/${GAMES_DATADIR}"/{${PN}/data/jdoom,doom-data} || die


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/doomsday/
@ 2016-01-13  6:29 Michael Sterrett
  0 siblings, 0 replies; 36+ messages in thread
From: Michael Sterrett @ 2016-01-13  6:29 UTC (permalink / raw
  To: gentoo-commits

commit:     9bf4096870adf506a9f3d9437568e5d506f48bd8
Author:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 13 06:25:17 2016 +0000
Commit:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Wed Jan 13 06:29:36 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bf40968

games-fps/doomsday: version bump (bug #559676)

Package-Manager: portage-2.2.26

 games-fps/doomsday/Manifest               |   1 +
 games-fps/doomsday/doomsday-1.15.7.ebuild | 183 ++++++++++++++++++++++++++++++
 2 files changed, 184 insertions(+)

diff --git a/games-fps/doomsday/Manifest b/games-fps/doomsday/Manifest
index 1b49112..3d79526 100644
--- a/games-fps/doomsday/Manifest
+++ b/games-fps/doomsday/Manifest
@@ -1 +1,2 @@
 DIST doomsday-1.14.5.tar.gz 14081857 SHA256 019cd0cf89e69d80cd8f6fbbd3e3fd57b8ae4d0bcdf4285e8a71caad9f46417e SHA512 f8ecf7d213ab57081858226ab4078fcf8f250271be19a3ce5883c01e53c43b5c0e7afc16085703fe19c0cbccb795c7fd1b651e3efb8a8e854160131c6374cd9a WHIRLPOOL 2351129c6dba951ca4975e6f6e92d78c75ad3e8f9648e9129a9f5a3a22c295b25c4fdb87d5208b2d3fe9c0af94c4ff968730929fbc645da9171018a672cfc60e
+DIST doomsday-stable-1.15.7.tar.gz 52055761 SHA256 9d833e458e72df7723b7a1b209cc53dc868d070ce7912a53c8c7887b1df933f3 SHA512 8b0ea09a46d88dd7bb8213878401d0eccca960ac08da1b77fb359f92b9a519b3e474007c5e0a42dd44684e909be529710be52b8fabbf62975536a99385fc4d66 WHIRLPOOL 78d40bb932072e2f3380f0a64f807d251ea64efe8e5eca0c7a3360b43be51988ea2b06264a7f7bd1c89e15c4d330dcba4a0c57b612f399a0e15c2c4567d14601

diff --git a/games-fps/doomsday/doomsday-1.15.7.ebuild b/games-fps/doomsday/doomsday-1.15.7.ebuild
new file mode 100644
index 0000000..b453730
--- /dev/null
+++ b/games-fps/doomsday/doomsday-1.15.7.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# TODO: fmod support broken (deng_fmod)
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit python-r1 eutils qt5-build games
+
+DESCRIPTION="A modern gaming engine for Doom, Heretic, and Hexen"
+HOMEPAGE="http://www.dengine.net/"
+SRC_URI="mirror://sourceforge/deng/Doomsday%20Engine/${PV}/${PN}-stable-${PV}.tar.gz"
+
+LICENSE="GPL-3+ LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dedicated fluidsynth openal snowberry +doom demo freedoom heretic hexen resources tools"
+# we need python at build time, so
+# snowberry? ( ${PYTHON_REQUIRED_USE} )
+# could break the build
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	demo? ( doom ) freedoom? ( doom ) resources? ( doom )"
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtopengl:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtgui:5
+	net-misc/curl
+	sys-libs/zlib
+	media-libs/assimp
+	!dedicated? (
+		media-libs/libsdl2[joystick,sound]
+		media-libs/sdl2-mixer
+		media-libs/libpng:0
+		virtual/opengl
+		virtual/glu
+		x11-libs/libX11
+		x11-libs/libXrandr
+		x11-libs/libXxf86vm
+	)
+	fluidsynth? ( media-sound/fluidsynth )
+	openal? ( media-libs/openal )
+	tools? ( sys-libs/ncurses:0 )"
+RDEPEND="${DEPEND}
+	!dedicated? (
+		snowberry? (
+			${PYTHON_DEPS}
+			dev-lang/python-exec:2[${PYTHON_USEDEP}]
+			dev-python/wxpython[${PYTHON_USEDEP}]
+		)
+	)"
+DEPEND="${DEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig"
+PDEPEND="
+	!dedicated? (
+		demo? ( games-fps/doom-data )
+		freedoom? ( games-fps/freedoom )
+		resources? ( games-fps/doomsday-resources )
+	)"
+
+S=${WORKDIR}/${PN}-stable-${PV}/${PN}
+
+pkg_setup() {
+	games_pkg_setup
+	python_setup
+}
+
+src_prepare() {
+	sed -i \
+		-e '/readme.path/s#$$PREFIX#/usr#' \
+		client/client.pro server/server.pro || die
+
+	sed -i \
+		-e "/DENG_BASE_DIR =/s:\$\$PREFIX/share:${GAMES_DATADIR}:" \
+		config_unix.pri || die
+
+	{
+		echo "CONFIG += nostrip"
+		echo "PREFIX=${GAMES_PREFIX}"
+
+		if use dedicated ; then
+			echo "CONFIG += deng_noclient"
+			echo "CONFIG += deng_nosnowberry"
+		else
+			echo "CONFIG += deng_$(usex snowberry '' no)snowberry"
+		fi
+
+		use fluidsynth && echo "CONFIG += deng_fluidsynth"
+
+		use tools || echo "CONFIG += deng_notools"
+
+		use openal && echo "CONFIG += deng_openal"
+
+	} > config_user.pri || die
+
+	qt5-build_src_prepare
+}
+
+#Usage: doom_make_wrapper <name> <game> <icon> <desktop entry title> [args]
+doom_make_wrapper() {
+	local name=$1 game=$2 icon=$3 de_title=$4
+	shift 4
+	games_make_wrapper $name "doomsday -game ${game} $@"
+	make_desktop_entry $name "${de_title}" ${icon}
+}
+
+src_configure() {
+	qt5-build_src_configure
+}
+
+src_install() {
+	qt5-build_src_install
+
+	dodoc "${S}"/../README.md
+
+	mv "${D}/${GAMES_DATADIR}"/{${PN}/data/jdoom,doom-data} || die
+	dosym "${GAMES_DATADIR}"/doom-data "${GAMES_DATADIR}"/${PN}/data/jdoom
+
+	if use !dedicated ; then
+		if use snowberry ; then
+			python_replicate_script "${D}"/"${GAMES_BINDIR}"/launch-doomsday
+
+			installmodules() {
+				# relocate snowberry module directory recursively into site-packages
+				python_domodule "${D}/${GAMES_DATADIR}"/${PN}/snowberry
+				# hack around improper path handling
+				sed -i \
+					-e "s:os.chdir.*$:os.chdir('$(python_get_sitedir)/snowberry'):" \
+					"${D%/}$(python_get_scriptdir)"/launch-doomsday || die
+			}
+			python_foreach_impl installmodules
+			# remove old module dir
+			rm -r "${D}/${GAMES_DATADIR}"/${PN}/snowberry || die
+
+			make_desktop_entry launch-doomsday "Snowberry DoomsDay" snowberry
+			doicon ../snowberry/graphics/snowberry.png
+		fi
+
+		if use doom; then
+			local res_arg
+
+			if use resources; then
+				res_arg="-def \"${GAMES_DATADIR}\"/${PN}/defs/jdoom/jDRP.ded"
+			fi
+
+			doicon ../snowberry/graphics/orb-doom.png
+			doom_make_wrapper jdoom doom1 orb-doom "DoomsDay Engine: Doom 1" "${res_arg}"
+			elog "Created jdoom launcher. To play Doom place your doom.wad to"
+			elog "\"${GAMES_DATADIR}\"/doom-data"
+			elog
+
+			if use demo; then
+				doom_make_wrapper jdoom-demo doom1-share orb-doom "DoomsDay Engine: Doom 1 Demo" \
+					"-iwad \"${GAMES_DATADIR}\"/doom-data/doom1.wad ${res_arg}"
+			fi
+			if use freedoom; then
+				doom_make_wrapper jdoom-freedoom doom1-share orb-doom "DoomsDay Engine: FreeDoom" \
+					"-iwad \"${GAMES_DATADIR}\"/doom-data/freedoom/doom1.wad"
+			fi
+		fi
+		if use hexen; then
+			doicon ../snowberry/graphics/orb-hexen.png
+			doom_make_wrapper jhexen hexen orb-hexen "DoomsDay Engine: Hexen"
+
+			elog "Created jhexen launcher. To play Hexen place your hexen.wad to"
+			elog "\"${GAMES_DATADIR}\"/${PN}/data/jhexen"
+			elog
+		fi
+		if use heretic; then
+			doicon ../snowberry/graphics/orb-heretic.png
+			doom_make_wrapper jheretic heretic orb-heretic "DoomsDay Engine: Heretic"
+
+			elog "Created jheretic launcher. To play Heretic place your heretic.wad to"
+			elog "\"${GAMES_DATADIR}\"/${PN}/data/jheretic"
+			elog
+		fi
+	fi
+
+	prepgamesdirs
+}


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/doomsday/
@ 2016-01-13  6:29 Michael Sterrett
  0 siblings, 0 replies; 36+ messages in thread
From: Michael Sterrett @ 2016-01-13  6:29 UTC (permalink / raw
  To: gentoo-commits

commit:     118cf52ad4d4f1085a2d35b574d4892d8d715d2a
Author:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 13 06:25:55 2016 +0000
Commit:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Wed Jan 13 06:29:37 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=118cf52a

games-fps/doomsday: add slot dep for sys-libs/ncurses

Package-Manager: portage-2.2.26

 games-fps/doomsday/doomsday-1.14.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-fps/doomsday/doomsday-1.14.5.ebuild b/games-fps/doomsday/doomsday-1.14.5.ebuild
index 5052a79..a229a14 100644
--- a/games-fps/doomsday/doomsday-1.14.5.ebuild
+++ b/games-fps/doomsday/doomsday-1.14.5.ebuild
@@ -40,7 +40,7 @@ DEPEND="
 	)
 	fluidsynth? ( media-sound/fluidsynth )
 	openal? ( media-libs/openal )
-	tools? ( sys-libs/ncurses )"
+	tools? ( sys-libs/ncurses:0 )"
 RDEPEND="${DEPEND}
 	!dedicated? (
 		snowberry? (


^ permalink raw reply related	[flat|nested] 36+ messages in thread

end of thread, other threads:[~2024-06-08  9:56 UTC | newest]

Thread overview: 36+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-29 17:13 [gentoo-commits] repo/gentoo:master commit in: games-fps/doomsday/ Pacho Ramos
  -- strict thread matches above, loose matches on Subject: below --
2024-06-08  9:56 James Le Cuirot
2024-03-25  9:21 Sam James
2024-03-25  9:21 Sam James
2023-12-19  5:19 Sam James
2022-09-19  6:42 Michał Górny
2022-06-07 23:07 James Le Cuirot
2022-06-07 23:07 James Le Cuirot
2022-06-03 12:34 Joonas Niilola
2022-02-11 23:16 Ionen Wolkens
2021-03-06  2:34 Sam James
2021-03-06  2:34 Sam James
2021-01-12 15:22 Sam James
2021-01-12 15:22 Sam James
2020-11-22  0:12 Andreas Sturmlechner
2020-04-03 20:07 Andreas Sturmlechner
2019-09-15  9:17 Mikle Kolyada
2019-07-22  9:25 Michał Górny
2019-05-04  9:14 James Le Cuirot
2019-05-04  9:14 James Le Cuirot
2019-05-04  9:14 James Le Cuirot
2019-05-04  9:14 James Le Cuirot
2019-05-04  9:14 James Le Cuirot
2019-05-04  9:14 James Le Cuirot
2018-04-29 17:13 Pacho Ramos
2018-04-29 17:13 Pacho Ramos
2016-11-03  9:14 Michael Palimaka
2016-11-03  9:14 Michael Palimaka
2016-05-09 18:11 Michael Sterrett
2016-04-20 15:17 Ian Stakenvicius
2016-04-07  3:23 Michael Sterrett
2016-03-06 12:58 Agostino Sarubbo
2016-01-15 19:33 Michael Sterrett
2016-01-14 21:28 Michael Sterrett
2016-01-13  6:29 Michael Sterrett
2016-01-13  6:29 Michael Sterrett

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox