[gentoo-commits] repo/gentoo:master commit in: games-action/dxx-rebirth/

2023-07-02 Thread James Le Cuirot 
commit: 2cd1928d091e58cef119ada825706cb7282aae2a
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Jul  2 20:24:51 2023 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Jul  2 20:24:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cd1928d

games-action/dxx-rebirth: Bump snapshot to fix building without OpenGL

Closes: https://bugs.gentoo.org/909160
Signed-off-by: James Le Cuirot  gentoo.org>

 games-action/dxx-rebirth/Manifest   | 2 +-
 ...-0.61.0_pre20230625.ebuild => dxx-rebirth-0.61.0_pre20230627.ebuild} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-action/dxx-rebirth/Manifest 
b/games-action/dxx-rebirth/Manifest
index 1e9f551586c4..23c2db8d1f44 100644
--- a/games-action/dxx-rebirth/Manifest
+++ b/games-action/dxx-rebirth/Manifest
@@ -1 +1 @@
-DIST dxx-rebirth-0.61.0_pre20230625.tar.gz 2063234 BLAKE2B 
5ca7c699e7240553c6106fc008acf08e56fbbf8eed15fa6988390b82f149f91c522bf1fcaebf463fc0923ed2b5518f71f913b17c446a04176addc8f6fa03fab7
 SHA512 
21a1fa46da4f4b20515e79c746bc6eac82164777c88caf6dd048f8e289f85914c1ae844f8bad6f858855172e8556649f60daa17b9ea23c2d6854e4acb777ee2a
+DIST dxx-rebirth-0.61.0_pre20230627.tar.gz 2063584 BLAKE2B 
d779ec6f4a5491e667675fd960a157f51f19b07d9889c1c0093df45467f671cddc89b965ec578bef556c193d561d6b322b607d9afd9ff940ca39506f3809a227
 SHA512 
e6c91010d9bf0806c5fcec1bc66423130cd47b79e109c7e0b0d454184cb4aae5915498f2c4f88c8779ed3570878138a1ec4ab5d9a3c64ddf8002173115e4135d

diff --git a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20230625.ebuild 
b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20230627.ebuild
similarity index 99%
rename from games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20230625.ebuild
rename to games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20230627.ebuild
index dc93d9200327..f5a5a16ffe59 100644
--- a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20230625.ebuild
+++ b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20230627.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..11} )
-MY_COMMIT="e9daf03769d8408719c1b420a133155cb700b9a2"
+MY_COMMIT="ad9452d51b7ccd7d2ad7fe56318f21898a3c2d43"
 
 # Games under Gentoo are marked as 'testing' by convention
 #

[gentoo-commits] repo/gentoo:master commit in: games-action/dxx-rebirth/files/, games-action/dxx-rebirth/

2023-06-25 Thread James Le Cuirot 
commit: f7e3fb37f3159af53bdf851e812278655b512a3a
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Jun 25 21:39:11 2023 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Jun 25 21:39:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7e3fb37

games-action/dxx-rebirth: Bump snapshot to 20230625

My new patch was merged upstream already.

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

 games-action/dxx-rebirth/Manifest  |  2 +-
 ...build => dxx-rebirth-0.61.0_pre20230625.ebuild} |  6 +---
 ...x-rebirth-0.61.0_pre20230618-sdl12-compat.patch | 38 --
 3 files changed, 2 insertions(+), 44 deletions(-)

diff --git a/games-action/dxx-rebirth/Manifest 
b/games-action/dxx-rebirth/Manifest
index 69e7f50bc883..1e9f551586c4 100644
--- a/games-action/dxx-rebirth/Manifest
+++ b/games-action/dxx-rebirth/Manifest
@@ -1 +1 @@
-DIST dxx-rebirth-0.61.0_pre20230618.tar.gz 2063234 BLAKE2B 
d602e8e92f8a494eabe3645e4c465f1f1b1bc10a0b27d4b518a617f07c90c86c903b7a6bed42085bfe992cd8533f57ac6eca2c10ee0b02d5fc677859f0d80bd3
 SHA512 
a0a0318169ed55ef9969fe9827d87871bec3d168fb94bed1e7d0c61ce62fdad9f57040181f2c05f9107a0f898ba4876b802e74d43028c90169eefebd2b9eb79d
+DIST dxx-rebirth-0.61.0_pre20230625.tar.gz 2063234 BLAKE2B 
5ca7c699e7240553c6106fc008acf08e56fbbf8eed15fa6988390b82f149f91c522bf1fcaebf463fc0923ed2b5518f71f913b17c446a04176addc8f6fa03fab7
 SHA512 
21a1fa46da4f4b20515e79c746bc6eac82164777c88caf6dd048f8e289f85914c1ae844f8bad6f858855172e8556649f60daa17b9ea23c2d6854e4acb777ee2a

diff --git a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20230618.ebuild 
b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20230625.ebuild
similarity index 98%
rename from games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20230618.ebuild
rename to games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20230625.ebuild
index 833ffdb92ee8..dc93d9200327 100644
--- a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20230618.ebuild
+++ b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20230625.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..11} )
-MY_COMMIT="111f6f2f0dd8de7c2f669eb4d784a0d9e9f124f9"
+MY_COMMIT="e9daf03769d8408719c1b420a133155cb700b9a2"
 
 # Games under Gentoo are marked as 'testing' by convention
 #
@@ -168,10 +168,6 @@ BDEPEND="virtual/pkgconfig"
 # and therefore requires a rebuild when changed.
 #IUSE_RUNTIME="flac l10n_de midi mp3 opl3-musicpack sc55-musicpack vorbis"
 
-PATCHES=(
-   "${FILESDIR}"/${P}-sdl12-compat.patch
-)
-
 dxx_scons() {
# Always build profile `m`.  If use editor, also build profile `e`.
# Set most variables in the default anonymous profile.  Only

diff --git 
a/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20230618-sdl12-compat.patch
 
b/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20230618-sdl12-compat.patch
deleted file mode 100644
index 4c01c8cd0dbb..
--- 
a/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20230618-sdl12-compat.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From e9daf03769d8408719c1b420a133155cb700b9a2 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot 
-Date: Sun, 25 Jun 2023 15:16:55 +0100
-Subject: [PATCH] Skip SDL OpenGL build check when the SDL2 wrapper is detected
-
-The wrapper does not define SDL_VIDEO_OPENGL in SDL_config.h. This
-appears to be deliberate, although it's not entirely clear why.
-
-/* Don't define most of the SDL backends, under the assumption checking 
for these against the headers won't work anyhow.
-   The exception is the X11 backend; you need its define to know if you 
can use its syswm interface. */
-
-We could check SDL2's SDL_config.h instead, but that seems awkward to
-pull off.
-
-Closes: https://github.com/dxx-rebirth/dxx-rebirth/issues/689

- SConstruct | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/SConstruct b/SConstruct
-index c98a22bc8..59210a802 100644
 a/SConstruct
-+++ b/SConstruct
-@@ -1586,9 +1586,11 @@ static void terminate_handler()
-   init_cdrom = '0' if sdl2 else 'SDL_INIT_CDROM'
-   error_text_opengl_mismatch = f'Rebirth configured with OpenGL 
enabled, but SDL{sdl2} configured with OpenGL disabled.  Disable Rebirth OpenGL 
or install an SDL{sdl2} with OpenGL enabled.'
-   test_opengl = (f'''
-+#if !((SDL_MAJOR_VERSION == 1) && (SDL_MINOR_VERSION == 2) && (SDL_PATCHLEVEL 
>= 50))
- #ifndef SDL_VIDEO_OPENGL
- #error "{error_text_opengl_mismatch}"
- #endif
-+#endif
- ''') if user_settings.opengl else ''
-   main = '''
-   SDL_RWops *ops = reinterpret_cast(argv);
--- 
-2.40.1
-

[gentoo-commits] repo/gentoo:master commit in: games-action/dxx-rebirth/files/, games-action/dxx-rebirth/

2023-06-25 Thread James Le Cuirot 
commit: 97b3716002195ef742d8d5305a952267474034c6
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Jun 25 15:17:38 2023 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Jun 25 15:17:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97b37160

games-action/dxx-rebirth: Bump snapshot to 20230618, drop old 20210623, EAPI 8

This fixes building with GCC 13 and the sdl12-compat wrapper.

Closes: https://bugs.gentoo.org/896952
Closes: https://bugs.gentoo.org/900212
Closes: https://bugs.gentoo.org/907746
Signed-off-by: James Le Cuirot  gentoo.org>

 games-action/dxx-rebirth/Manifest  |  2 +-
 ...build => dxx-rebirth-0.61.0_pre20230618.ebuild} | 36 ---
 games-action/dxx-rebirth/dxx-rebirth-.ebuild   | 34 ---
 ...-rebirth-0.61.0_pre20210623-gcc-12-editor.patch | 23 --
 .../dxx-rebirth-0.61.0_pre20210623-gcc-12.patch| 25 ---
 .../dxx-rebirth-0.61.0_pre20210623-scons-4.5.patch | 51 --
 ...x-rebirth-0.61.0_pre20230618-sdl12-compat.patch | 38 
 7 files changed, 78 insertions(+), 131 deletions(-)

diff --git a/games-action/dxx-rebirth/Manifest 
b/games-action/dxx-rebirth/Manifest
index 4e590d8f682a..69e7f50bc883 100644
--- a/games-action/dxx-rebirth/Manifest
+++ b/games-action/dxx-rebirth/Manifest
@@ -1 +1 @@
-DIST dxx-rebirth_20210623-src.tar.xz 1340044 BLAKE2B 
f16a8904d777559e789d719bc0d6d2dbb7d26c1128984117b6c64a334ae589dd5806439cc51e458a583e1b6cc831dae7c51bf7bd3fbc972989b0ce4e5b932a4e
 SHA512 
150d873fa045df6fb2f9bb70334d08eeae0cc7a639e825f1352fed28501ab9541a27bf3395fc1929bc8d76ed9126b038eed67c5a01657f43116da4663e929821
+DIST dxx-rebirth-0.61.0_pre20230618.tar.gz 2063234 BLAKE2B 
d602e8e92f8a494eabe3645e4c465f1f1b1bc10a0b27d4b518a617f07c90c86c903b7a6bed42085bfe992cd8533f57ac6eca2c10ee0b02d5fc677859f0d80bd3
 SHA512 
a0a0318169ed55ef9969fe9827d87871bec3d168fb94bed1e7d0c61ce62fdad9f57040181f2c05f9107a0f898ba4876b802e74d43028c90169eefebd2b9eb79d

diff --git a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild 
b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20230618.ebuild
similarity index 92%
rename from games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild
rename to games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20230618.ebuild
index 77aab2a2ddca..833ffdb92ee8 100644
--- a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild
+++ b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20230618.ebuild
@@ -1,29 +1,35 @@
 # Copyright 2017-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{10..11} )
+MY_COMMIT="111f6f2f0dd8de7c2f669eb4d784a0d9e9f124f9"
+
+# Games under Gentoo are marked as 'testing' by convention
+#
+# Other architectures are reported to work, but not tested regularly by
+# the core team.
+#
+# Raspberry Pi support is tested by an outside contributor, and his
+# fixes are merged into the main source by upstream.
+#
+# Cross-compilation to Windows is also supported.
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 
 inherit desktop flag-o-matic python-any-r1 scons-utils toolchain-funcs xdg
 
 if [[ "${PV}" =  ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/dxx-rebirth/dxx-rebirth;
+   unset KEYWORDS
+elif [[ -n ${MY_COMMIT} ]]; then
+   S="${WORKDIR}/${PN}-${MY_COMMIT}"
+   
SRC_URI="https://codeload.github.com/dxx-rebirth/dxx-rebirth/tar.gz/${MY_COMMIT}
 -> ${PN}-${PVR}.tar.gz"
+   unset MY_COMMIT
 else
S="${WORKDIR}/${PN}_${PV##*_pre}-src"

SRC_URI="https://www.dxx-rebirth.com/download/dxx/rebirth/${PN}_${PV##*_pre}-src.tar.xz;
-
-   # Games under Gentoo are marked as 'testing' by convention
-   #
-   # Other architectures are reported to work, but not tested regularly by
-   # the core team.
-   #
-   # Raspberry Pi support is tested by an outside contributor, and his
-   # fixes are merged into the main source by upstream.
-   #
-   # Cross-compilation to Windows is also supported.
-   KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Descent Rebirth - enhanced Descent 1 & 2 engine"
@@ -163,9 +169,7 @@ BDEPEND="virtual/pkgconfig"
 #IUSE_RUNTIME="flac l10n_de midi mp3 opl3-musicpack sc55-musicpack vorbis"
 
 PATCHES=(
-   "${FILESDIR}"/${P}-gcc-12.patch
-   "${FILESDIR}"/${P}-gcc-12-editor.patch
-   "${FILESDIR}"/${P}-scons-4.5.patch
+   "${FILESDIR}"/${P}-sdl12-compat.patch
 )
 
 dxx_scons() {

diff --git a/games-action/dxx-rebirth/dxx-rebirth-.ebuild 
b/games-action/dxx-rebirth/dxx-rebirth-.ebuild
index b13187e490c0..81bd934fd3b2 100644
--- a/games-action/dxx-rebirth/dxx-rebirth-.ebuild
+++ b/games-action/dxx-rebirth/dxx-rebirth-.ebuild
@@ -1,31 +1,35 @@
 # Copyright 2017-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8

[gentoo-commits] repo/gentoo:master commit in: games-action/dxx-rebirth/

2023-05-14 Thread Sam James 
commit: 498ae000c2bcc016929049fe6f33e5b5aae039a2
Author: Sam James  gentoo  org>
AuthorDate: Sun May 14 17:01:25 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May 14 17:10:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=498ae000

games-action/dxx-rebirth: defer to new global USE=valgrind description

Signed-off-by: Sam James  gentoo.org>

 games-action/dxx-rebirth/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/games-action/dxx-rebirth/metadata.xml 
b/games-action/dxx-rebirth/metadata.xml
index 416662962e74..ee4bdde42738 100644
--- a/games-action/dxx-rebirth/metadata.xml
+++ b/games-action/dxx-rebirth/metadata.xml
@@ -32,7 +32,6 @@
Include alternate version of the 
game's music, recorded with the Roland Sound Canvas SC-55 MIDI module
Use libSDL2, SDL2-mixer instead of libSDL-1* 
and SDL-mixer-1*
Enable support for the PHP-based 
multiplayer game tracker
-   Include a Valgrind header in build in 
order to support Memcheck client requests


dxx-rebirth/dxx-rebirth

[gentoo-commits] repo/gentoo:master commit in: games-action/dxx-rebirth/files/, games-action/dxx-rebirth/

2023-03-22 Thread Ionen Wolkens 
commit: e655d87f9fdf2a3c80da8f3fb01478faad74e88d
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Mar 22 15:51:26 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Mar 22 16:16:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e655d87f

games-action/dxx-rebirth: fix build with scons-4.5.x

Live is only partially fixed (old snapshot needs a 2 part fix), but
imagine the PR will get merged soon enough, so not adding to .

Not tested much, but seems fine with both scons-4.4.0 and 4.5.2.

Closes: https://bugs.gentoo.org/902463
Signed-off-by: Ionen Wolkens  gentoo.org>

 .../dxx-rebirth-0.61.0_pre20210623.ebuild  |  1 +
 .../dxx-rebirth-0.61.0_pre20210623-scons-4.5.patch | 51 ++
 2 files changed, 52 insertions(+)

diff --git a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild 
b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild
index 1dea43f4d04b..77aab2a2ddca 100644
--- a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild
+++ b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild
@@ -165,6 +165,7 @@ BDEPEND="virtual/pkgconfig"
 PATCHES=(
"${FILESDIR}"/${P}-gcc-12.patch
"${FILESDIR}"/${P}-gcc-12-editor.patch
+   "${FILESDIR}"/${P}-scons-4.5.patch
 )
 
 dxx_scons() {

diff --git 
a/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-scons-4.5.patch 
b/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-scons-4.5.patch
new file mode 100644
index ..0adc507cada5
--- /dev/null
+++ 
b/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-scons-4.5.patch
@@ -0,0 +1,51 @@
+https://bugs.gentoo.org/902463
+
+https://github.com/dxx-rebirth/dxx-rebirth/pull/705
+https://github.com/dxx-rebirth/dxx-rebirth/commit/189ac23f61605903eb3eaa0004d287b7bd9296bc
+--- a/SConstruct
 b/SConstruct
+@@ -324,3 +324,3 @@
+   def __init__(self,env,keyviews,_l=[]):
+-  self.flags = {k: env.get(k, _l)[:] for k in 
itertools.chain.from_iterable(keyviews)}
++  self.flags = {k: env.get(k, _l).copy() for k in 
itertools.chain.from_iterable(keyviews)}
+   def restore(self,env):
+@@ -1493,3 +1493,3 @@
+   user_settings.max_axes_per_joystick = 
user_settings.max_buttons_per_joystick = user_settings.max_hats_per_joystick = 0
+-  successflags['CPPDEFINES'] = CPPDEFINES = 
successflags.get('CPPDEFINES', [])[:]
++  successflags['CPPDEFINES'] = CPPDEFINES = 
successflags.get('CPPDEFINES', []).copy()
+   # use Redbook if at least one of the following applies
+@@ -4608,3 +4608,3 @@
+   for test in runtime_test_boost_tests:
+-  LIBS = [] if test.nodefaultlibs else env['LIBS'][:]
++  LIBS = [] if test.nodefaultlibs else env['LIBS'].copy()
+   LIBS.append('boost_unit_test_framework')
+@@ -4850,3 +4850,3 @@
+   kwargs['CXXFLAGS'] = (env['CXXFLAGS'] or []) + ['-E']
+-  kwargs['CPPDEFINES'] = (env['CPPDEFINES'] or []) + [
++  kwargs['CPPDEFINES'] = list(env['CPPDEFINES'] or []) + [
+   # Define these tokens to themselves so 
that
+@@ -4870,3 +4870,3 @@
+   def _apply_env_version_seq(self,env,_empty={}):
+-  return _empty if self.user_settings.pch else {'CPPDEFINES' : 
env['CPPDEFINES'] + [('DXX_VERSION_SEQ', self.DXX_VERSION_SEQ)]}
++  return _empty if self.user_settings.pch else {'CPPDEFINES' : 
list(env['CPPDEFINES']) + [('DXX_VERSION_SEQ', self.DXX_VERSION_SEQ)]}
+   get_objects_similar_arch_ogl = 
DXXCommon.create_lazy_object_states_getter((LazyObjectState(sources=(
+@@ -4966,3 +4966,3 @@
+ ),
+-  transform_env = (lambda self, env: {'CPPDEFINES' : 
env['CPPDEFINES'] + env.__dxx_CPPDEFINE_SHAREPATH + 
env.__dxx_CPPDEFINE_git_version}),
++  transform_env = (lambda self, env: {'CPPDEFINES' : 
list(env['CPPDEFINES']) + env.__dxx_CPPDEFINE_SHAREPATH + 
env.__dxx_CPPDEFINE_git_version}),
+   transform_target=_apply_target_name,
+@@ -4976,3 +4976,3 @@
+ ),
+-  transform_env = (lambda self, env: {'CPPDEFINES' : 
env['CPPDEFINES'] + env.__dxx_CPPDEFINE_SHAREPATH}),
++  transform_env = (lambda self, env: {'CPPDEFINES' : 
list(env['CPPDEFINES']) + env.__dxx_CPPDEFINE_SHAREPATH}),
+   transform_target=_apply_target_name,
+@@ -5185,3 +5185,3 @@
+   versid_build_environ = ['CXX', 'CPPFLAGS', 'CXXFLAGS', 
'LINKFLAGS']
+-  versid_cppdefines = env['CPPDEFINES'][:]
++  versid_cppdefines = env['CPPDEFINES'].copy()
+   extra_version = user_settings.extra_version
+@@ -5303,3 +5303,3 @@
+   else:
+-  syspath = sys.path[:]
++  syspath = sys.path.copy()
+   cocoa =

[gentoo-commits] repo/gentoo:master commit in: games-action/dxx-rebirth/, games-action/dxx-rebirth/files/

2023-03-22 Thread Ionen Wolkens 
commit: 70624559be845a557e769ab88d3003a375b1e41e
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Mar 22 15:44:24 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Mar 22 16:16:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70624559

games-action/dxx-rebirth: fix USE=editor with gcc12

Likely scarcely enabled given not reported yet, but bug #902463
enabled USE=editor and would've been the next issue ran into.

Ideally this will probably need a new snapshot soon as this
doesn't seem to be the only issue. Not that I plan to look into
this package outside minor fixes (haven't even attempted to run,
don't really know it).

Bug: https://bugs.gentoo.org/902463
Signed-off-by: Ionen Wolkens  gentoo.org>

 .../dxx-rebirth-0.61.0_pre20210623.ebuild  |  1 +
 ...-rebirth-0.61.0_pre20210623-gcc-12-editor.patch | 23 ++
 2 files changed, 24 insertions(+)

diff --git a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild 
b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild
index f703b0ade70e..1dea43f4d04b 100644
--- a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild
+++ b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild
@@ -164,6 +164,7 @@ BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
"${FILESDIR}"/${P}-gcc-12.patch
+   "${FILESDIR}"/${P}-gcc-12-editor.patch
 )
 
 dxx_scons() {

diff --git 
a/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-gcc-12-editor.patch
 
b/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-gcc-12-editor.patch
new file mode 100644
index ..fbb03cf8f334
--- /dev/null
+++ 
b/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-gcc-12-editor.patch
@@ -0,0 +1,23 @@
+With USE=editor and gcc12:
+
+similar/main/piggy.cpp: In function 'void d2x::piggy_new_pigfile(char*)':
+similar/main/piggy.cpp:870:62: error: '%u' directive output may be 
truncated writing between 1 and 10 bytes into a region of size between 7 and 19 
[-Werror=format-truncation=]
+
+But the offending code is unused, so can just drop it.
+
+Backport from:
+https://github.com/dxx-rebirth/dxx-rebirth/commit/12cca97870efe419613462dc279963a77bc80d9a
+--- a/similar/main/piggy.cpp
 b/similar/main/piggy.cpp
+@@ -889,11 +889,8 @@ void piggy_new_pigfile(char *pigname)
+   }
+   
+   for (fnum=0;fnum

[gentoo-commits] repo/gentoo:master commit in: games-action/dxx-rebirth/files/, games-action/dxx-rebirth/

2023-03-09 Thread Sam James 
commit: ef781b2e02df4142141a43ee8da72738c42c67c3
Author: Sam James  gentoo  org>
AuthorDate: Fri Mar 10 07:39:28 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar 10 07:45:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef781b2e

games-action/dxx-rebirth: fix build w/ gcc 12

Closes: https://bugs.gentoo.org/894678
Signed-off-by: Sam James  gentoo.org>

 .../dxx-rebirth-0.61.0_pre20210623.ebuild  |  4 
 .../dxx-rebirth-0.61.0_pre20210623-gcc-12.patch| 25 ++
 2 files changed, 29 insertions(+)

diff --git a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild 
b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild
index 853ff1d1f770..f703b0ade70e 100644
--- a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild
+++ b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild
@@ -162,6 +162,10 @@ BDEPEND="virtual/pkgconfig"
 # and therefore requires a rebuild when changed.
 #IUSE_RUNTIME="flac l10n_de midi mp3 opl3-musicpack sc55-musicpack vorbis"
 
+PATCHES=(
+   "${FILESDIR}"/${P}-gcc-12.patch
+)
+
 dxx_scons() {
# Always build profile `m`.  If use editor, also build profile `e`.
# Set most variables in the default anonymous profile.  Only

diff --git 
a/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-gcc-12.patch 
b/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-gcc-12.patch
new file mode 100644
index ..3681385976a6
--- /dev/null
+++ b/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-gcc-12.patch
@@ -0,0 +1,25 @@
+https://bugs.gentoo.org/894678
+https://github.com/dxx-rebirth/dxx-rebirth/commit/092daecb6118b3c072c71a8bea24f119e300bd49
+
+From 092daecb6118b3c072c71a8bea24f119e300bd49 Mon Sep 17 00:00:00 2001
+From: Kp 
+Date: Sat, 28 May 2022 21:04:37 +
+Subject: [PATCH] Use static_cast<> to convert player_marker_num to
+ game_marker_index
+
+gcc-12 rejects the list initialization syntax.  Switch to static_cast<>,
+which generates equivalent code.
+
+Reported-by: dbermond 
+--- a/similar/main/automap.cpp
 b/similar/main/automap.cpp
+@@ -370,7 +370,7 @@ game_marker_index 
convert_player_marker_index_to_game_marker_index(const game_mo
+   return static_cast((player_num * 
MAX_DROP_MULTI_COOP) + static_cast(player_marker_num));
+   if (game_mode & GM_MULTI)
+   return static_cast((player_num * 
MAX_DROP_MULTI_COMPETITIVE) + static_cast(player_marker_num));
+-  return game_marker_index{player_marker_num};
++  return static_cast(player_marker_num);
+ }
+ 
+ unsigned d_marker_state::get_markers_per_player(const game_mode_flags 
game_mode, const unsigned max_numplayers)
+

[gentoo-commits] repo/gentoo:master commit in: games-action/dxx-rebirth/

2022-11-22 Thread Arthur Zamarin 
commit: 1a54f5f629144b6bfb120055fc74b9b3fe298869
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Nov 22 13:59:54 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Nov 22 13:59:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a54f5f6

games-action/dxx-rebirth: Keyword 0.61.0_pre20210623 ppc64, #850472

Signed-off-by: Arthur Zamarin  gentoo.org>

 games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild 
b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild
index 52185ad3b734..0ea0b301d6e5 100644
--- a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild
+++ b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild
@@ -23,7 +23,7 @@ else
# fixes are merged into the main source by upstream.
#
# Cross-compilation to Windows is also supported.
-   KEYWORDS="~amd64 ~arm64 ~x86"
+   KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Descent Rebirth - enhanced Descent 1 & 2 engine"

[gentoo-commits] repo/gentoo:master commit in: games-action/dxx-rebirth/

2022-02-11 Thread Ionen Wolkens 
commit: c45b16abf06b88f48703b3bb2103901972297454
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Feb 12 01:15:56 2022 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Feb 12 01:31:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c45b16ab

games-action/dxx-rebirth: cleanup unnecessarily added deps

On closer look I don't think these scripts are used, and adding
the eclass regardless of these is normal given how scons-utils
works. So it only makes PYTHON_DEPS redundant.

Fixes: ba65a523a982f51e0037f74e3ad36c6da3f58ed9
Signed-off-by: Ionen Wolkens  gentoo.org>

 games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild | 4 +---
 games-action/dxx-rebirth/dxx-rebirth-.ebuild   | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild 
b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild
index 3dc11a9d646a..52185ad3b734 100644
--- a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild
+++ b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild
@@ -151,9 +151,7 @@ REQUIRED_USE='
sdl2? ( opengl )
 '
 
-BDEPEND="
-   ${PYTHON_DEPS}
-   virtual/pkgconfig"
+BDEPEND="virtual/pkgconfig"
 
 # As of this writing, IUSE_RUNTIME is a GLEP, but not an implemented
 # feature.  This variable is stored here to be ready to activate when

diff --git a/games-action/dxx-rebirth/dxx-rebirth-.ebuild 
b/games-action/dxx-rebirth/dxx-rebirth-.ebuild
index af05d12398b6..36013cd510bc 100644
--- a/games-action/dxx-rebirth/dxx-rebirth-.ebuild
+++ b/games-action/dxx-rebirth/dxx-rebirth-.ebuild
@@ -153,9 +153,7 @@ REQUIRED_USE='
sdl2? ( opengl )
 '
 
-BDEPEND="
-   ${PYTHON_DEPS}
-   virtual/pkgconfig"
+BDEPEND="virtual/pkgconfig"
 
 # As of this writing, IUSE_RUNTIME is a GLEP, but not an implemented
 # feature.  This variable is stored here to be ready to activate when

[gentoo-commits] repo/gentoo:master commit in: games-action/dxx-rebirth/

2022-02-11 Thread Ionen Wolkens 
commit: 7a032c929dd470bf0af3782f7c985659b3fbbed0
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Feb 11 22:03:24 2022 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Feb 11 23:13:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a032c92

games-action/dxx-rebirth: replace -O3 by -O2

Currently fails with -O3, haven't investigated further but do
a replace-flags as a quick workaround.

Closes: https://bugs.gentoo.org/831896
Signed-off-by: Ionen Wolkens  gentoo.org>

 games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild | 3 ++-
 games-action/dxx-rebirth/dxx-rebirth-.ebuild   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild 
b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild
index 90a8b6d8c8ef..3dc11a9d646a 100644
--- a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild
+++ b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{8..10} )
 
-inherit desktop python-any-r1 scons-utils toolchain-funcs xdg
+inherit desktop flag-o-matic python-any-r1 scons-utils toolchain-funcs xdg
 
 if [[ "${PV}" =  ]]; then
inherit git-r3
@@ -217,6 +217,7 @@ dxx_scons() {
 
 src_compile() {
tc-export CXX PKG_CONFIG
+   replace-flags -O3 -O2 #831896
dxx_scons register_install_target=0 build
 }
 

diff --git a/games-action/dxx-rebirth/dxx-rebirth-.ebuild 
b/games-action/dxx-rebirth/dxx-rebirth-.ebuild
index ed7efde84b19..e73e35686d41 100644
--- a/games-action/dxx-rebirth/dxx-rebirth-.ebuild
+++ b/games-action/dxx-rebirth/dxx-rebirth-.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{8..10} )
 
-inherit desktop python-any-r1 scons-utils toolchain-funcs xdg
+inherit desktop flag-o-matic python-any-r1 scons-utils toolchain-funcs xdg
 
 if [[ "${PV}" =  ]]; then
inherit git-r3
@@ -219,6 +219,7 @@ dxx_scons() {
 
 src_compile() {
tc-export CXX PKG_CONFIG
+   replace-flags -O3 -O2 #831896
dxx_scons register_install_target=0 build
 }

[gentoo-commits] repo/gentoo:master commit in: games-action/dxx-rebirth/

2022-02-11 Thread Ionen Wolkens 
commit: ba65a523a982f51e0037f74e3ad36c6da3f58ed9
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Feb 11 21:54:41 2022 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Feb 11 23:13:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba65a523

games-action/dxx-rebirth: enable py3.10

Also add PYTHON_DEPS for completeness, although this is technically
all already handled by scons-utils (imagine python-any-r1 was added
because dxx-rebirth has its own python scripts too, but doing so
means should add python deps normally).

Signed-off-by: Ionen Wolkens  gentoo.org>

 games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild | 8 +---
 games-action/dxx-rebirth/dxx-rebirth-.ebuild   | 8 +---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild 
b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild
index b941cf320c02..90a8b6d8c8ef 100644
--- a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild
+++ b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2017-2021 Gentoo Authors
+# Copyright 2017-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 desktop python-any-r1 scons-utils toolchain-funcs xdg
 
@@ -151,7 +151,9 @@ REQUIRED_USE='
sdl2? ( opengl )
 '
 
-BDEPEND="virtual/pkgconfig"
+BDEPEND="
+   ${PYTHON_DEPS}
+   virtual/pkgconfig"
 
 # As of this writing, IUSE_RUNTIME is a GLEP, but not an implemented
 # feature.  This variable is stored here to be ready to activate when

diff --git a/games-action/dxx-rebirth/dxx-rebirth-.ebuild 
b/games-action/dxx-rebirth/dxx-rebirth-.ebuild
index 8b70e138369e..ed7efde84b19 100644
--- a/games-action/dxx-rebirth/dxx-rebirth-.ebuild
+++ b/games-action/dxx-rebirth/dxx-rebirth-.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2017-2021 Gentoo Authors
+# Copyright 2017-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 desktop python-any-r1 scons-utils toolchain-funcs xdg
 
@@ -153,7 +153,9 @@ REQUIRED_USE='
sdl2? ( opengl )
 '
 
-BDEPEND="virtual/pkgconfig"
+BDEPEND="
+   ${PYTHON_DEPS}
+   virtual/pkgconfig"
 
 # As of this writing, IUSE_RUNTIME is a GLEP, but not an implemented
 # feature.  This variable is stored here to be ready to activate when

[gentoo-commits] repo/gentoo:master commit in: games-action/dxx-rebirth/

2022-02-11 Thread Ionen Wolkens 
commit: 17308acaf3d8bed0e951d47bbef67beb646e8968
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Feb 11 22:06:05 2022 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Feb 11 23:13:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17308aca

games-action/dxx-rebirth: sync keywords in live ebuild

Signed-off-by: Ionen Wolkens  gentoo.org>

 games-action/dxx-rebirth/dxx-rebirth-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-action/dxx-rebirth/dxx-rebirth-.ebuild 
b/games-action/dxx-rebirth/dxx-rebirth-.ebuild
index e73e35686d41..af05d12398b6 100644
--- a/games-action/dxx-rebirth/dxx-rebirth-.ebuild
+++ b/games-action/dxx-rebirth/dxx-rebirth-.ebuild
@@ -25,7 +25,7 @@ else
# fixes are merged into the main source by upstream.
#
# Cross-compilation to Windows is also supported.
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 DESCRIPTION="Descent Rebirth - enhanced Descent 1 & 2 engine"

[gentoo-commits] repo/gentoo:master commit in: games-action/dxx-rebirth/

2021-10-18 Thread Sam James 
commit: 46a738b3380e8fa170ff6dcbdd174543f14c9aa7
Author: Sam James  gentoo  org>
AuthorDate: Tue Oct 19 00:18:55 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct 19 00:18:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46a738b3

games-action/dxx-rebirth: Keyword 0.61.0_pre20210623 arm64, #805497

Signed-off-by: Sam James  gentoo.org>

 games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild 
b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild
index f2aeb8f86f4..b941cf320c0 100644
--- a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild
+++ b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild
@@ -23,7 +23,7 @@ else
# fixes are merged into the main source by upstream.
#
# Cross-compilation to Windows is also supported.
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 DESCRIPTION="Descent Rebirth - enhanced Descent 1 & 2 engine"

[gentoo-commits] repo/gentoo:master commit in: games-action/dxx-rebirth/

2021-07-10 Thread James Le Cuirot 
commit: 94813df7fda738f9eefb7ade14a05a7bda54268e
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Jul 10 22:15:24 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Jul 10 22:15:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94813df7

games-action/dxx-rebirth: Drop old 0.61.0_pre20200615

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: James Le Cuirot  gentoo.org>

 games-action/dxx-rebirth/Manifest  |   1 -
 .../dxx-rebirth-0.61.0_pre20200615.ebuild  | 257 -
 2 files changed, 258 deletions(-)

diff --git a/games-action/dxx-rebirth/Manifest 
b/games-action/dxx-rebirth/Manifest
index f41040fea49..4e590d8f682 100644
--- a/games-action/dxx-rebirth/Manifest
+++ b/games-action/dxx-rebirth/Manifest
@@ -1,2 +1 @@
-DIST dxx-rebirth-0.61.0_pre20200615.tar.gz 1959226 BLAKE2B 
08d66eb1599100172e2bd8dcb8e13ca11314f3b06658c36851ddc7d91897a8376899b7c33b6e7a2d7b72e93cf7f20f157994d06f880e138dc807350e4c64c517
 SHA512 
3470e2b9cf20268f1af5e8084f0b361d1dd5d797bee9a1d97ce5509046f79750ac214d0f34e7eef1acc4ee4ae868ad3f34d33b45ff16386e9d8a7d758db2
 DIST dxx-rebirth_20210623-src.tar.xz 1340044 BLAKE2B 
f16a8904d777559e789d719bc0d6d2dbb7d26c1128984117b6c64a334ae589dd5806439cc51e458a583e1b6cc831dae7c51bf7bd3fbc972989b0ce4e5b932a4e
 SHA512 
150d873fa045df6fb2f9bb70334d08eeae0cc7a639e825f1352fed28501ab9541a27bf3395fc1929bc8d76ed9126b038eed67c5a01657f43116da4663e929821

diff --git a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20200615.ebuild 
b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20200615.ebuild
deleted file mode 100644
index 2f380b10341..000
--- a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20200615.ebuild
+++ /dev/null
@@ -1,257 +0,0 @@
-# Copyright 2017-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit desktop python-any-r1 scons-utils toolchain-funcs xdg
-
-if [[ "${PV}" =  ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/dxx-rebirth/dxx-rebirth;
-else
-   # dxx-rebirth-0.61.0_pre20190720.ebuild
-   #MY_COMMIT='a17792c89fd49dd12fdf5981670dd7f64b42850f'
-   # dxx-rebirth-0.61.0_pre20200615.ebuild
-   MY_COMMIT='0c2fcf691ffb2a586991350d67f3efd1cca2a1f3'
-   # dxx-rebirth-0.61.0_pre20200627.ebuild
-   #MY_COMMIT='aba40babb47d36a88011af01e4bc0fc00dca74ef'
-   S="${WORKDIR}/${PN}-${MY_COMMIT}"
-   
#SRC_URI="https://github.com/dxx-rebirth/dxx-rebirth/archive/${MY_COMMIT}.tar.gz
 -> ${PN}-${PVR}.tar.gz"
-   
SRC_URI="https://codeload.github.com/dxx-rebirth/dxx-rebirth/tar.gz/${MY_COMMIT}
 -> ${PN}-${PVR}.tar.gz"
-   unset MY_COMMIT
-
-   # Games under Gentoo are marked as 'testing' by convention
-   #
-   # Other architectures are reported to work, but not tested regularly by
-   # the core team.
-   #
-   # Raspberry Pi support is tested by an outside contributor, and his
-   # fixes are merged into the main source by upstream.
-   #
-   # Cross-compilation to Windows is also supported.
-   KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Descent Rebirth - enhanced Descent 1 & 2 engine"
-HOMEPAGE="https://www.dxx-rebirth.com/;
-
-LICENSE="DXX-Rebirth GPL-3"
-SLOT="0"
-
-# Default to building both game engines.  The total size is relatively
-# small.
-IUSE="+d1x +d2x +data debug editor +flac ipv6 +joystick l10n_de +midi +mp3 
+music +opengl opl3-musicpack +png sc55-musicpack sdl2 tracker valgrind +vorbis"
-
-# Game data is stored in HOG files.
-# Game movies are in MVL files.
-# Various add-ons use zip files to bundle their content together.
-#
-# PNG support enables writing screenshots as PNG instead of TGA (for
-# USE=opengl) or PCX (for USE=-opengl).
-DEPEND="dev-games/physfs[hog,mvl,zip]
-   opengl? (
-   virtual/opengl
-   virtual/glu )
-   png? ( media-libs/libpng )
-"
-
-# As of this writing, there is no Portage shorthand syntax to express:
-# "
-#  flag1? ( package[flag1] )
-#  flag2? ( package[flag2] )
-#  ...
-#  flagN? ( package[flagN] )
-# ", such that unsetting all flags removes the dependency on package.
-# Fake it by using a text fragment that is repeatedly expanded with
-# differing substitutions.
-#
-# The use of single quotes is intentional here.  The ${word} is a
-# placeholder to be matched by text substitution when the fragment is
-# expanded, not a shell variable reference.
-#
-# For each flag, depend on freedata using the same flag.  If none of the
-# flags are set, freedata is not needed.
-DXX_RDEPEND_USE_FREEDATA_FRAGMENT='
-   ${USE}? ( games-action/descent${ENGINE}-freedata[${USE}] )
-'
-# Block <0.59.100 due to file collision.
-#
-# If USE=data, then require a game data package.
-# The build process does not use the game data, nor change how the game
-# is built based on what game data will be used.  At startup, the

[gentoo-commits] repo/gentoo:master commit in: games-action/dxx-rebirth/

2021-07-10 Thread James Le Cuirot 
commit: 5ca99171eb0a4d194a52fb62ec6ed79f9f33f5aa
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Jul 10 22:14:56 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Jul 10 22:14:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ca99171

games-action/dxx-rebirth: Bump snapshot to 20210623

Fixes: https://bugs.gentoo.org/801487
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: James Le Cuirot  gentoo.org>

 games-action/dxx-rebirth/Manifest | 1 +
 ...-rebirth-.ebuild => dxx-rebirth-0.61.0_pre20210623.ebuild} | 8 
 games-action/dxx-rebirth/dxx-rebirth-.ebuild  | 2 ++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/games-action/dxx-rebirth/Manifest 
b/games-action/dxx-rebirth/Manifest
index 1b705069b99..f41040fea49 100644
--- a/games-action/dxx-rebirth/Manifest
+++ b/games-action/dxx-rebirth/Manifest
@@ -1 +1,2 @@
 DIST dxx-rebirth-0.61.0_pre20200615.tar.gz 1959226 BLAKE2B 
08d66eb1599100172e2bd8dcb8e13ca11314f3b06658c36851ddc7d91897a8376899b7c33b6e7a2d7b72e93cf7f20f157994d06f880e138dc807350e4c64c517
 SHA512 
3470e2b9cf20268f1af5e8084f0b361d1dd5d797bee9a1d97ce5509046f79750ac214d0f34e7eef1acc4ee4ae868ad3f34d33b45ff16386e9d8a7d758db2
+DIST dxx-rebirth_20210623-src.tar.xz 1340044 BLAKE2B 
f16a8904d777559e789d719bc0d6d2dbb7d26c1128984117b6c64a334ae589dd5806439cc51e458a583e1b6cc831dae7c51bf7bd3fbc972989b0ce4e5b932a4e
 SHA512 
150d873fa045df6fb2f9bb70334d08eeae0cc7a639e825f1352fed28501ab9541a27bf3395fc1929bc8d76ed9126b038eed67c5a01657f43116da4663e929821

diff --git a/games-action/dxx-rebirth/dxx-rebirth-.ebuild 
b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild
similarity index 97%
copy from games-action/dxx-rebirth/dxx-rebirth-.ebuild
copy to games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild
index b29054e2a7b..f2aeb8f86f4 100644
--- a/games-action/dxx-rebirth/dxx-rebirth-.ebuild
+++ b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild
@@ -11,11 +11,11 @@ if [[ "${PV}" =  ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/dxx-rebirth/dxx-rebirth;
 else
-   MY_COMMIT=''
-   S="${WORKDIR}/${PN}-${MY_COMMIT}"
-   
SRC_URI="https://codeload.github.com/dxx-rebirth/dxx-rebirth/tar.gz/${MY_COMMIT}
 -> ${PN}-${PVR}.tar.gz"
-   unset MY_COMMIT
+   S="${WORKDIR}/${PN}_${PV##*_pre}-src"
+   
SRC_URI="https://www.dxx-rebirth.com/download/dxx/rebirth/${PN}_${PV##*_pre}-src.tar.xz;
 
+   # Games under Gentoo are marked as 'testing' by convention
+   #
# Other architectures are reported to work, but not tested regularly by
# the core team.
#

diff --git a/games-action/dxx-rebirth/dxx-rebirth-.ebuild 
b/games-action/dxx-rebirth/dxx-rebirth-.ebuild
index b29054e2a7b..8b70e138369 100644
--- a/games-action/dxx-rebirth/dxx-rebirth-.ebuild
+++ b/games-action/dxx-rebirth/dxx-rebirth-.ebuild
@@ -16,6 +16,8 @@ else

SRC_URI="https://codeload.github.com/dxx-rebirth/dxx-rebirth/tar.gz/${MY_COMMIT}
 -> ${PN}-${PVR}.tar.gz"
unset MY_COMMIT
 
+   # Games under Gentoo are marked as 'testing' by convention
+   #
# Other architectures are reported to work, but not tested regularly by
# the core team.
#

[gentoo-commits] repo/gentoo:master commit in: games-action/dxx-rebirth/

2021-06-18 Thread David Seifert 
commit: abcb33fd929136f442625c084a62be1353aa3010
Author: Sam James  gentoo  org>
AuthorDate: Fri Jun 18 21:07:17 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Jun 18 21:07:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abcb33fd

games-action/dxx-rebirth: add missing virtual/pkgconfig dependency

Based on tc-export PKG_CONFIG call.

Package-Manager: Portage-3.0.18-prefix, Repoman-3.0.3
Signed-off-by: Sam James  gentoo.org>
Signed-off-by: David Seifert  gentoo.org>

 games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20200615.ebuild | 2 ++
 games-action/dxx-rebirth/dxx-rebirth-.ebuild   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20200615.ebuild 
b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20200615.ebuild
index 86ced2d16b5..2f380b10341 100644
--- a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20200615.ebuild
+++ b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20200615.ebuild
@@ -168,6 +168,8 @@ REQUIRED_USE='
 # and therefore requires a rebuild when changed.
 #IUSE_RUNTIME="flac l10n_de midi mp3 opl3-musicpack sc55-musicpack vorbis"
 
+BDEPEND="virtual/pkgconfig"
+
 dxx_scons() {
# Always build profile `m`.  If use editor, also build profile `e`.
# Set most variables in the default anonymous profile.  Only

diff --git a/games-action/dxx-rebirth/dxx-rebirth-.ebuild 
b/games-action/dxx-rebirth/dxx-rebirth-.ebuild
index 5a01f9daaef..b29054e2a7b 100644
--- a/games-action/dxx-rebirth/dxx-rebirth-.ebuild
+++ b/games-action/dxx-rebirth/dxx-rebirth-.ebuild
@@ -151,6 +151,8 @@ REQUIRED_USE='
sdl2? ( opengl )
 '
 
+BDEPEND="virtual/pkgconfig"
+
 # As of this writing, IUSE_RUNTIME is a GLEP, but not an implemented
 # feature.  This variable is stored here to be ready to activate when
 # Portage implements this feature.

[gentoo-commits] repo/gentoo:master commit in: games-action/dxx-rebirth/

2021-04-24 Thread David Seifert 
commit: f41b8bb55ee6515510c8007b61e808636a09fff9
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sat Apr 24 22:02:24 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Apr 24 22:02:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f41b8bb5

games-action/dxx-rebirth: remove unused eclass

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: David Seifert  gentoo.org>

 games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20200615.ebuild | 3 ++-
 games-action/dxx-rebirth/dxx-rebirth-.ebuild   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20200615.ebuild 
b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20200615.ebuild
index c2ee8a2d717..86ced2d16b5 100644
--- a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20200615.ebuild
+++ b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20200615.ebuild
@@ -5,7 +5,8 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit desktop eutils python-any-r1 scons-utils toolchain-funcs xdg
+inherit desktop python-any-r1 scons-utils toolchain-funcs xdg
+
 if [[ "${PV}" =  ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/dxx-rebirth/dxx-rebirth;

diff --git a/games-action/dxx-rebirth/dxx-rebirth-.ebuild 
b/games-action/dxx-rebirth/dxx-rebirth-.ebuild
index 57704796963..5a01f9daaef 100644
--- a/games-action/dxx-rebirth/dxx-rebirth-.ebuild
+++ b/games-action/dxx-rebirth/dxx-rebirth-.ebuild
@@ -5,7 +5,8 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit desktop eutils python-any-r1 scons-utils toolchain-funcs xdg
+inherit desktop python-any-r1 scons-utils toolchain-funcs xdg
+
 if [[ "${PV}" =  ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/dxx-rebirth/dxx-rebirth;

[gentoo-commits] repo/gentoo:master commit in: games-action/dxx-rebirth/

2021-04-22 Thread Sam James 
commit: 49ab8e7a60c850bc89c4f603589121d2fbf9d122
Author: Sam James  gentoo  org>
AuthorDate: Thu Apr 22 12:04:53 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Apr 22 12:04:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49ab8e7a

games-action/dxx-rebirth: fix typo

Closes: https://bugs.gentoo.org/785040
Signed-off-by: Sam James  gentoo.org>

 games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20200615.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20200615.ebuild 
b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20200615.ebuild
index c46c7fc0513..c2ee8a2d717 100644
--- a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20200615.ebuild
+++ b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20200615.ebuild
@@ -16,7 +16,7 @@ else
MY_COMMIT='0c2fcf691ffb2a586991350d67f3efd1cca2a1f3'
# dxx-rebirth-0.61.0_pre20200627.ebuild
#MY_COMMIT='aba40babb47d36a88011af01e4bc0fc00dca74ef'
-   S="${WORKDIR}/${P}N-${MY_COMMIT}"
+   S="${WORKDIR}/${PN}-${MY_COMMIT}"

#SRC_URI="https://github.com/dxx-rebirth/dxx-rebirth/archive/${MY_COMMIT}.tar.gz
 -> ${PN}-${PVR}.tar.gz"

SRC_URI="https://codeload.github.com/dxx-rebirth/dxx-rebirth/tar.gz/${MY_COMMIT}
 -> ${PN}-${PVR}.tar.gz"
unset MY_COMMIT

[gentoo-commits] repo/gentoo:master commit in: games-action/dxx-rebirth/

2021-01-11 Thread Sam James 
commit: 7950a501ad4592144b6b073ba4e837f72b68705b
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 11 20:41:36 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 11 20:41:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7950a501

games-action/dxx-rebirth: add Python 3.8, 3.9

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

 games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20200615.ebuild | 5 +++--
 games-action/dxx-rebirth/dxx-rebirth-.ebuild   | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20200615.ebuild 
b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20200615.ebuild
index a48cde126a3..12559c094e0 100644
--- a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20200615.ebuild
+++ b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20200615.ebuild
@@ -1,8 +1,9 @@
-# Copyright 2017-2020 Gentoo Authors
+# Copyright 2017-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_7 )
+
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit desktop eutils python-any-r1 scons-utils toolchain-funcs xdg
 if [[ "$PV" =  ]]; then

diff --git a/games-action/dxx-rebirth/dxx-rebirth-.ebuild 
b/games-action/dxx-rebirth/dxx-rebirth-.ebuild
index c48c467cbad..a65b62b8be9 100644
--- a/games-action/dxx-rebirth/dxx-rebirth-.ebuild
+++ b/games-action/dxx-rebirth/dxx-rebirth-.ebuild
@@ -1,8 +1,9 @@
-# Copyright 2017-2020 Gentoo Authors
+# Copyright 2017-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_7 )
+
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit desktop eutils python-any-r1 scons-utils toolchain-funcs xdg
 if [[ "$PV" =  ]]; then

[gentoo-commits] repo/gentoo:master commit in: games-action/dxx-rebirth/

2020-11-30 Thread James Le Cuirot 
commit: 89850c8b33950e2beb5339b6dab886d9b5fbc31f
Author: Ian Silvester  fastmail  fm>
AuthorDate: Mon Nov 30 14:59:16 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Mon Nov 30 15:35:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89850c8b

games-action/dxx-rebirth: Adjusting copyright header to satisfy GLEP76

Signed-off-by: Ian Silvester  fastmail.fm>
Signed-off-by: James Le Cuirot  gentoo.org>

 games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20200615.ebuild | 8 +---
 games-action/dxx-rebirth/dxx-rebirth-.ebuild   | 8 +---
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20200615.ebuild 
b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20200615.ebuild
index 484618e8c27..a48cde126a3 100644
--- a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20200615.ebuild
+++ b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20200615.ebuild
@@ -1,12 +1,6 @@
-# Copyright 2017-2020 DXX Rebirth project contributors
+# Copyright 2017-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# This file is part of the DXX-Rebirth project.
-#
-# It is copyright by its individual contributors, as recorded in the
-# project's Git history.  See COPYING.txt at the top level for license
-# terms and a link to the Git history.
-
 EAPI=7
 PYTHON_COMPAT=( python3_7 )
 

diff --git a/games-action/dxx-rebirth/dxx-rebirth-.ebuild 
b/games-action/dxx-rebirth/dxx-rebirth-.ebuild
index 119e998d23c..c48c467cbad 100644
--- a/games-action/dxx-rebirth/dxx-rebirth-.ebuild
+++ b/games-action/dxx-rebirth/dxx-rebirth-.ebuild
@@ -1,12 +1,6 @@
-# Copyright 2017-2020 DXX Rebirth project contributors
+# Copyright 2017-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# This file is part of the DXX-Rebirth project.
-#
-# It is copyright by its individual contributors, as recorded in the
-# project's Git history.  See COPYING.txt at the top level for license
-# terms and a link to the Git history.
-
 EAPI=7
 PYTHON_COMPAT=( python3_7 )

[gentoo-commits] repo/gentoo:master commit in: games-action/dxx-rebirth/files/, games-action/dxx-rebirth/

2020-09-15 Thread James Le Cuirot 
commit: 71d1dfc95b4248348d2b55dd5cbe28b6c2b5856b
Author: James Le Cuirot  gentoo  org>
AuthorDate: Mon Sep 14 21:09:12 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Sep 15 08:43:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71d1dfc9

games-action/dxx-rebirth: Drop old 0.59.100

Closes: https://bugs.gentoo.org/669212
Closes: https://bugs.gentoo.org/703090
Closes: https://bugs.gentoo.org/735534
Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: James Le Cuirot  gentoo.org>

 games-action/dxx-rebirth/Manifest  |   8 --
 .../dxx-rebirth/dxx-rebirth-0.59.100.ebuild| 108 -
 .../files/dxx-rebirth-0.59.100-flags.patch |  10 --
 ...-rebirth-0.59.100-physfs-3-no-deprecation.patch |  30 --
 .../files/dxx-rebirth-0.59.100-sharepath.patch |  11 ---
 games-action/dxx-rebirth/metadata.xml  |   3 -
 6 files changed, 170 deletions(-)

diff --git a/games-action/dxx-rebirth/Manifest 
b/games-action/dxx-rebirth/Manifest
index 730b013b264..1b705069b99 100644
--- a/games-action/dxx-rebirth/Manifest
+++ b/games-action/dxx-rebirth/Manifest
@@ -1,9 +1 @@
-DIST d1xr-briefings-ger.dxa 16798 BLAKE2B 
f5e1f4f91cb3464b3d356fab1e3993700cc19f3f2db8682f5194e59aa5d2623efa427db4135c3595534e5dac0f2589b53aac7df3610501b759407e1ead342458
 SHA512 
956a3ef1fe7379b71d5f651fdcb1f26b786883a35193a0a22009204e885a12fceb3a69c6accbeb2bd20be65afe087d23532d7ef3439edd97cc8904968bf519e3
-DIST d1xr-hires.dxa 1426884 BLAKE2B 
c4d9b950353fc450c64568779bc3d2e93a46e17980c8df08a2ef06bff5b9709869fdbbaf4fb6698be994b3faae7a75036a53357743d47b728bb3ef9df126afd8
 SHA512 
3fc84d5610ba40ee383c1720f80513a21b4644ff8b6da4b84ebca13b11c1131deb4897ded6324b54845b6c847dfc0f16700535e16afdd7ebe83bfff042892302
-DIST d1xr-opl3-music.dxa 81503503 BLAKE2B 
b560597e0f08139109a6dc4ee7996c05010561686029d1fd754375278b8a11e6df0f6106c797d524e92d4998683d6e1e07b6cfc982ea3ff167a0b9ca92ba0dc2
 SHA512 
4ac82c4bc2ddb02e2941746921443e38b698c6e54cfcab317fc9108f84ada7b868ec2ee3c70b28c1dfe9f41e2aadab4124c8daa65a409905cba5d674f0aab8a8
-DIST d1xr-sc55-music.dxa 72803408 BLAKE2B 
eb52491f5c43e9f04aea5715cffc0a47d029dda0b8e5ae1a79ec36122a17c01e3b2a731f369d72fe0e069e1188bdaf03f82d0845b574d76b6798be33481e3b84
 SHA512 
3cdce5b6535e28397b3216cc9ca05cccf7194349c62d64c54300f02f39248b98598d170599e5c61b6900d780e4917f905c3c31eb814fbb8429221c804cbd8bf9
-DIST d2xr-briefings-ger.dxa 11717 BLAKE2B 
27af93656ac91bf5490195d2aebc9c9f252cb730094cccb53298b07f2e2031935033b8db765b40fdad93fb55b157a2be07906ea45185b754e5ec7c205803cc92
 SHA512 
479aa577dc65271c705e80404ec46e6c59ee3a5122d6e9705dbdd16b71b16c0d3447426e3e74937aa20eb7026f67a3896c5e814fbfcede9164bd557b6eb8423c
-DIST d2xr-opl3-music.dxa 22710919 BLAKE2B 
82bdf29b6afe88305d4c7b69bb8b094efcf33ad23becec223311775cd50600ed399c207ee3a05da3800bcc5e123d00f9f8fa7d2d4f4d4be57bbf71e1c2482a9c
 SHA512 
876321a9a16403f6e9d12e10bb73c9cdc57e1a106fa64833a1be8cc17b74f6f13e57e40f051a1b40e7bc88b95bfe86cff181c93c8619383dfdeb74f36f5cce86
-DIST d2xr-sc55-music.dxa 19579531 BLAKE2B 
16091e24477a49319f2685884a7538a3597a9132707ac1d59405fa08ce7492158075df4ee680a5c7ba44aa0bd0b16170057f6a8956eab4b56913d00ee2f1f339
 SHA512 
290713b05627bf65bdc55fc6631a0c86e50f484a167f3fd20b3fe2bc5b772437939b5bf32eea852874dd983fbd47f160cae2412a2d6c5319f0d1583a33d28da6
 DIST dxx-rebirth-0.61.0_pre20200615.tar.gz 1959226 BLAKE2B 
08d66eb1599100172e2bd8dcb8e13ca11314f3b06658c36851ddc7d91897a8376899b7c33b6e7a2d7b72e93cf7f20f157994d06f880e138dc807350e4c64c517
 SHA512 
3470e2b9cf20268f1af5e8084f0b361d1dd5d797bee9a1d97ce5509046f79750ac214d0f34e7eef1acc4ee4ae868ad3f34d33b45ff16386e9d8a7d758db2
-DIST dxx-rebirth_v0.59.100-src.tar.gz 1809614 BLAKE2B 
6826380312fa23dbc99459db9272cf7ffb5a00a14cfdd777339633fbd943a288af00f182692ebc3078e4c39bf6b6cc9fb05cc6a533ec126b8c881eb22c465868
 SHA512 
dc9b7ad263e189e779756b62613d4bc62371cb5fec2176a4013395fc18c9d03ab0c9ddc5ccf2668b87e4a77b25d500bdef373126f176bfce49f73b5a98de23d7

diff --git a/games-action/dxx-rebirth/dxx-rebirth-0.59.100.ebuild 
b/games-action/dxx-rebirth/dxx-rebirth-0.59.100.ebuild
deleted file mode 100644
index df217142951..000
--- a/games-action/dxx-rebirth/dxx-rebirth-0.59.100.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils scons-utils toolchain-funcs xdg
-
-MY_P="${PN}_v${PV}-src"
-DESCRIPTION="Descent Rebirth - enhanced Descent 1 & 2 engine"
-HOMEPAGE="https://www.dxx-rebirth.com/;
-SRC_URI="https://www.dxx-rebirth.com/download/dxx/${MY_P}.tar.gz
-   opl3-musicpack? (
-   descent1? ( 
https://www.dxx-rebirth.com/download/dxx/res/d1xr-opl3-music.dxa )
-   descent2? ( 
https://www.dxx-rebirth.com/download/dxx/res/d2xr-opl3-music.dxa ) )
-   sc55-musicpack? (
-   descent1? ( 
https://www.dxx-rebirth.com/download/dxx/res/d1xr-sc55-music.dxa )
-

[gentoo-commits] repo/gentoo:master commit in: games-action/dxx-rebirth/

2020-07-03 Thread James Le Cuirot 
commit: 8868a8d5c560db8f7f7baf4cfd8aeb2adb3968ab
Author: Ian Silvester  fastmail  fm>
AuthorDate: Thu Jun 18 02:22:37 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Fri Jul  3 19:53:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8868a8d5

games-action/dxx-rebirth: Add udpated ebuilds

Add ebuilds so that the package supports current testing gcc 10, including a 
live ebuild, and references new free content packages.

Closes: https://bugs.gentoo.org/724886
Signed-off-by: Ian Silvester  fastmail.fm>
Closes: https://github.com/gentoo/gentoo/pull/16308
Signed-off-by: James Le Cuirot  gentoo.org>

 games-action/dxx-rebirth/Manifest  |   1 +
 .../dxx-rebirth-0.61.0_pre20200615.ebuild  | 262 +
 games-action/dxx-rebirth/dxx-rebirth-.ebuild   | 254 
 games-action/dxx-rebirth/metadata.xml  |  16 +-
 4 files changed, 529 insertions(+), 4 deletions(-)

diff --git a/games-action/dxx-rebirth/Manifest 
b/games-action/dxx-rebirth/Manifest
index 5a8d4fe15ad..730b013b264 100644
--- a/games-action/dxx-rebirth/Manifest
+++ b/games-action/dxx-rebirth/Manifest
@@ -5,4 +5,5 @@ DIST d1xr-sc55-music.dxa 72803408 BLAKE2B 
eb52491f5c43e9f04aea5715cffc0a47d029dd
 DIST d2xr-briefings-ger.dxa 11717 BLAKE2B 
27af93656ac91bf5490195d2aebc9c9f252cb730094cccb53298b07f2e2031935033b8db765b40fdad93fb55b157a2be07906ea45185b754e5ec7c205803cc92
 SHA512 
479aa577dc65271c705e80404ec46e6c59ee3a5122d6e9705dbdd16b71b16c0d3447426e3e74937aa20eb7026f67a3896c5e814fbfcede9164bd557b6eb8423c
 DIST d2xr-opl3-music.dxa 22710919 BLAKE2B 
82bdf29b6afe88305d4c7b69bb8b094efcf33ad23becec223311775cd50600ed399c207ee3a05da3800bcc5e123d00f9f8fa7d2d4f4d4be57bbf71e1c2482a9c
 SHA512 
876321a9a16403f6e9d12e10bb73c9cdc57e1a106fa64833a1be8cc17b74f6f13e57e40f051a1b40e7bc88b95bfe86cff181c93c8619383dfdeb74f36f5cce86
 DIST d2xr-sc55-music.dxa 19579531 BLAKE2B 
16091e24477a49319f2685884a7538a3597a9132707ac1d59405fa08ce7492158075df4ee680a5c7ba44aa0bd0b16170057f6a8956eab4b56913d00ee2f1f339
 SHA512 
290713b05627bf65bdc55fc6631a0c86e50f484a167f3fd20b3fe2bc5b772437939b5bf32eea852874dd983fbd47f160cae2412a2d6c5319f0d1583a33d28da6
+DIST dxx-rebirth-0.61.0_pre20200615.tar.gz 1959226 BLAKE2B 
08d66eb1599100172e2bd8dcb8e13ca11314f3b06658c36851ddc7d91897a8376899b7c33b6e7a2d7b72e93cf7f20f157994d06f880e138dc807350e4c64c517
 SHA512 
3470e2b9cf20268f1af5e8084f0b361d1dd5d797bee9a1d97ce5509046f79750ac214d0f34e7eef1acc4ee4ae868ad3f34d33b45ff16386e9d8a7d758db2
 DIST dxx-rebirth_v0.59.100-src.tar.gz 1809614 BLAKE2B 
6826380312fa23dbc99459db9272cf7ffb5a00a14cfdd777339633fbd943a288af00f182692ebc3078e4c39bf6b6cc9fb05cc6a533ec126b8c881eb22c465868
 SHA512 
dc9b7ad263e189e779756b62613d4bc62371cb5fec2176a4013395fc18c9d03ab0c9ddc5ccf2668b87e4a77b25d500bdef373126f176bfce49f73b5a98de23d7

diff --git a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20200615.ebuild 
b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20200615.ebuild
new file mode 100644
index 000..484618e8c27
--- /dev/null
+++ b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20200615.ebuild
@@ -0,0 +1,262 @@
+# Copyright 2017-2020 DXX Rebirth project contributors
+# Distributed under the terms of the GNU General Public License v2
+
+# This file is part of the DXX-Rebirth project.
+#
+# It is copyright by its individual contributors, as recorded in the
+# project's Git history.  See COPYING.txt at the top level for license
+# terms and a link to the Git history.
+
+EAPI=7
+PYTHON_COMPAT=( python3_7 )
+
+inherit desktop eutils python-any-r1 scons-utils toolchain-funcs xdg
+if [[ "$PV" =  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/dxx-rebirth/dxx-rebirth;
+   # Live ebuilds have blank keywords.
+   KEYWORDS=
+   PROPERTIES="live"
+else
+   # dxx-rebirth-0.61.0_pre20190720.ebuild
+   #MY_COMMIT='a17792c89fd49dd12fdf5981670dd7f64b42850f'
+   # dxx-rebirth-0.61.0_pre20200615.ebuild
+   MY_COMMIT='0c2fcf691ffb2a586991350d67f3efd1cca2a1f3'
+   # dxx-rebirth-0.61.0_pre20200627.ebuild
+   #MY_COMMIT='aba40babb47d36a88011af01e4bc0fc00dca74ef'
+   S="$WORKDIR/$PN-$MY_COMMIT"
+   
#SRC_URI="https://github.com/dxx-rebirth/dxx-rebirth/archive/$MY_COMMIT.tar.gz 
-> $PN-$PVR.tar.gz"
+   
SRC_URI="https://codeload.github.com/dxx-rebirth/dxx-rebirth/tar.gz/$MY_COMMIT 
-> $PN-$PVR.tar.gz"
+   unset MY_COMMIT
+
+   # Games under Gentoo are marked as 'testing' by convention
+   #
+   # Other architectures are reported to work, but not tested regularly by
+   # the core team.
+   #
+   # Raspberry Pi support is tested by an outside contributor, and his
+   # fixes are merged into the main source by upstream.
+   #
+   # Cross-compilation to Windows is also supported.
+   KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Descent Rebirth - enhanced Descent 1 & 2 engine"

[gentoo-commits] repo/gentoo:master commit in: games-action/dxx-rebirth/

2020-05-24 Thread Jonas Stein 
commit: 4c485c15a22c5535b5f3bab20976b040b5207a6d
Author: Jonas Stein  gentoo  org>
AuthorDate: Sun May 24 12:45:18 2020 +
Commit: Jonas Stein  gentoo  org>
CommitDate: Sun May 24 13:38:06 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c485c15

games-action/dxx-rebirth: Remove Maintainer

Remove inactive maintainer from the list.
See also comment 7 in
Bug: https://bugs.gentoo.org/703090
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Jonas Stein  gentoo.org>

 games-action/dxx-rebirth/metadata.xml | 4 
 1 file changed, 4 deletions(-)

diff --git a/games-action/dxx-rebirth/metadata.xml 
b/games-action/dxx-rebirth/metadata.xml
index b2765a3b029..fe3cc527f00 100644
--- a/games-action/dxx-rebirth/metadata.xml
+++ b/games-action/dxx-rebirth/metadata.xml
@@ -5,10 +5,6 @@
ga...@gentoo.org
Gentoo Games Project

-   
-   totktonada...@gmail.com
-   Alexander Turenko
-   

Descent 1 is a classic first-person shooter released in 1995
by Interplay and Parallax. Descent 2 released for the PC in

[gentoo-commits] repo/gentoo:master commit in: games-action/dxx-rebirth/

2018-04-18 Thread David Seifert 
commit: a1734d496f725e2aabb6e8677eac443ac5c177c7
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Wed Apr 18 07:01:20 2018 +
Commit: David Seifert  gentoo  org>
CommitDate: Wed Apr 18 18:14:43 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1734d49

games-action/dxx-rebirth: use HTTPS

Closes: https://github.com/gentoo/gentoo/pull/8051

 games-action/dxx-rebirth/dxx-rebirth-0.59.100.ebuild | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/games-action/dxx-rebirth/dxx-rebirth-0.59.100.ebuild 
b/games-action/dxx-rebirth/dxx-rebirth-0.59.100.ebuild
index d61ac5c0141..048eb3cb263 100644
--- a/games-action/dxx-rebirth/dxx-rebirth-0.59.100.ebuild
+++ b/games-action/dxx-rebirth/dxx-rebirth-0.59.100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,19 +7,19 @@ inherit eutils scons-utils toolchain-funcs xdg
 
 MY_P="${PN}_v${PV}-src"
 DESCRIPTION="Descent Rebirth - enhanced Descent 1 & 2 engine"
-HOMEPAGE="http://www.dxx-rebirth.com/;
-SRC_URI="http://www.dxx-rebirth.com/download/dxx/${MY_P}.tar.gz
+HOMEPAGE="https://www.dxx-rebirth.com/;
+SRC_URI="https://www.dxx-rebirth.com/download/dxx/${MY_P}.tar.gz
opl3-musicpack? (
-   descent1? ( 
http://www.dxx-rebirth.com/download/dxx/res/d1xr-opl3-music.dxa )
-   descent2? ( 
http://www.dxx-rebirth.com/download/dxx/res/d2xr-opl3-music.dxa ) )
+   descent1? ( 
https://www.dxx-rebirth.com/download/dxx/res/d1xr-opl3-music.dxa )
+   descent2? ( 
https://www.dxx-rebirth.com/download/dxx/res/d2xr-opl3-music.dxa ) )
sc55-musicpack? (
-   descent1? ( 
http://www.dxx-rebirth.com/download/dxx/res/d1xr-sc55-music.dxa )
-   descent2? ( 
http://www.dxx-rebirth.com/download/dxx/res/d2xr-sc55-music.dxa ) )
+   descent1? ( 
https://www.dxx-rebirth.com/download/dxx/res/d1xr-sc55-music.dxa )
+   descent2? ( 
https://www.dxx-rebirth.com/download/dxx/res/d2xr-sc55-music.dxa ) )
l10n_de? (
-   descent1? ( 
http://www.dxx-rebirth.com/download/dxx/res/d1xr-briefings-ger.dxa )
-   descent2? ( 
http://www.dxx-rebirth.com/download/dxx/res/d2xr-briefings-ger.dxa ) )
+   descent1? ( 
https://www.dxx-rebirth.com/download/dxx/res/d1xr-briefings-ger.dxa )
+   descent2? ( 
https://www.dxx-rebirth.com/download/dxx/res/d2xr-briefings-ger.dxa ) )
textures? (
-   descent1? ( 
http://www.dxx-rebirth.com/download/dxx/res/d1xr-hires.dxa ) )"
+   descent1? ( 
https://www.dxx-rebirth.com/download/dxx/res/d1xr-hires.dxa ) )"
 
 LICENSE="DXX-Rebirth GPL-3 public-domain"
 SLOT="0"

[gentoo-commits] repo/gentoo:master commit in: games-action/dxx-rebirth/, games-action/dxx-rebirth/files/

2017-04-27 Thread James Le Cuirot 
commit: efe0a6b71b3d882ed68904026c5bc4a58d29313d
Author: James Le Cuirot  gentoo  org>
AuthorDate: Thu Apr 27 21:18:16 2017 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Apr 27 21:41:27 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efe0a6b7

games-action/dxx-rebirth: New package to replace d[12]x-rebirth

Thanks to Alexander Turenko for his input on this.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 games-action/dxx-rebirth/Manifest  |   8 ++
 .../dxx-rebirth/dxx-rebirth-0.59.100.ebuild| 107 +
 .../files/dxx-rebirth-0.59.100-flags.patch |  10 ++
 .../files/dxx-rebirth-0.59.100-sharepath.patch |  11 +++
 games-action/dxx-rebirth/metadata.xml  |  39 
 5 files changed, 175 insertions(+)

diff --git a/games-action/dxx-rebirth/Manifest 
b/games-action/dxx-rebirth/Manifest
new file mode 100644
index 000..e6f07ff6f26
--- /dev/null
+++ b/games-action/dxx-rebirth/Manifest
@@ -0,0 +1,8 @@
+DIST d1xr-briefings-ger.dxa 16798 SHA256 
38f8b9dd5fcab8b675a5112290e4dda771d4bc7a613292a589f6535a8c53861a SHA512 
956a3ef1fe7379b71d5f651fdcb1f26b786883a35193a0a22009204e885a12fceb3a69c6accbeb2bd20be65afe087d23532d7ef3439edd97cc8904968bf519e3
 WHIRLPOOL 
0c4e7934eac399b6fed216648ba35ba100234f73a802112b900064584b4fb471bafc9e377af735a4d05fa65105a40ee4db781a1e07310a1e6b5feb4a9a10a29d
+DIST d1xr-hires.dxa 1426884 SHA256 
b30a164fa9c6dff05eda6d50f77df843968d32053f5cc9453fe89d5bed19 SHA512 
3fc84d5610ba40ee383c1720f80513a21b4644ff8b6da4b84ebca13b11c1131deb4897ded6324b54845b6c847dfc0f16700535e16afdd7ebe83bfff042892302
 WHIRLPOOL 
372b5edffc2694429d5c87e343f70564b73178b3d3c61abab5c93a02235547beab3046d9773fc6bcec9eea1f530ddadbfb51205049ca61297d16e08d39366d04
+DIST d1xr-opl3-music.dxa 81503503 SHA256 
8fe8fede12ca735cac28133e4a581c4026ed22845ab016814a745b2c10b81603 SHA512 
4ac82c4bc2ddb02e2941746921443e38b698c6e54cfcab317fc9108f84ada7b868ec2ee3c70b28c1dfe9f41e2aadab4124c8daa65a409905cba5d674f0aab8a8
 WHIRLPOOL 
a7fab740a6cf885984b93f1eb2512362d7c3b05eb65e5f1eecf4c374bf6ba9e04e6d91130d8ff14d113fa9639501cba768a9d7344af291975b095a6604066735
+DIST d1xr-sc55-music.dxa 72803408 SHA256 
b27f7b9dc5f9c2744402c56c9499dfd9503c17e73a2a5223e745529d7867962f SHA512 
3cdce5b6535e28397b3216cc9ca05cccf7194349c62d64c54300f02f39248b98598d170599e5c61b6900d780e4917f905c3c31eb814fbb8429221c804cbd8bf9
 WHIRLPOOL 
d248894b95d5a1d2d8d375cf231fbfde114548e328addf3ae71c90eb436c628b6feb7d207877fd59f815d4b4f00ea76b6e2c23c4a12cd8e2e228967beb91b693
+DIST d2xr-briefings-ger.dxa 11717 SHA256 
e190321e657c1ad55998b91d610534fd0275f29ab12fe56018e47d3e603704f9 SHA512 
479aa577dc65271c705e80404ec46e6c59ee3a5122d6e9705dbdd16b71b16c0d3447426e3e74937aa20eb7026f67a3896c5e814fbfcede9164bd557b6eb8423c
 WHIRLPOOL 
65093403524bd82fb4396a5cabf9317effdaf447f18e421b6a59642103bc690ddaa240e0d2db3fbfe1a4bbd83d9f62bfe5b70fdfe8dc76f0cfe00433d25a9e1f
+DIST d2xr-opl3-music.dxa 22710919 SHA256 
6890c6cf8a40c30a2b88339fe1affd25d210e45b504b0f0f76dba7ba97f813d7 SHA512 
876321a9a16403f6e9d12e10bb73c9cdc57e1a106fa64833a1be8cc17b74f6f13e57e40f051a1b40e7bc88b95bfe86cff181c93c8619383dfdeb74f36f5cce86
 WHIRLPOOL 
86cccdbe071654b7f3ba2f774c762b3ab81797916e8a2053466320a54693a1913de9a6759eb29a4acde5a5611c58d1371338bed140a4084f7d005d48151a639b
+DIST d2xr-sc55-music.dxa 19579531 SHA256 
ace152182c70b9a7ae6f911bddbc239566220a287ab5419cab260d5af739bf16 SHA512 
290713b05627bf65bdc55fc6631a0c86e50f484a167f3fd20b3fe2bc5b772437939b5bf32eea852874dd983fbd47f160cae2412a2d6c5319f0d1583a33d28da6
 WHIRLPOOL 
1cc02d95dfffc36676a8cd3129580ba11c4a5cb13ee54bcdbe9e30e9fd9d8365bf0a8fc0d3e4b962607887b41bd056678d578cf9a5896ba1c9f4d1bef13c3edd
+DIST dxx-rebirth_v0.59.100-src.tar.gz 1809614 SHA256 
6a1e1e589a007389df56efb9f7355efc36e7ea01e4c6af53b46ba1ec3f193355 SHA512 
dc9b7ad263e189e779756b62613d4bc62371cb5fec2176a4013395fc18c9d03ab0c9ddc5ccf2668b87e4a77b25d500bdef373126f176bfce49f73b5a98de23d7
 WHIRLPOOL 
4f6bf09bd076138749ac71d9279827502c6e6b021f8d9681fad83f043eee867e945997fa4ce6eb8f7f706c4932f9d20b47588645b58eee3b2523d5a81c68e99b

diff --git a/games-action/dxx-rebirth/dxx-rebirth-0.59.100.ebuild 
b/games-action/dxx-rebirth/dxx-rebirth-0.59.100.ebuild
new file mode 100644
index 000..d61ac5c0141
--- /dev/null
+++ b/games-action/dxx-rebirth/dxx-rebirth-0.59.100.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils scons-utils toolchain-funcs xdg
+
+MY_P="${PN}_v${PV}-src"
+DESCRIPTION="Descent Rebirth - enhanced Descent 1 & 2 engine"
+HOMEPAGE="http://www.dxx-rebirth.com/;
+SRC_URI="http://www.dxx-rebirth.com/download/dxx/${MY_P}.tar.gz
+   opl3-musicpack? (
+   descent1? ( 
http://www.dxx-rebirth.com/download/dxx/res/d1xr-opl3-music.dxa )
+   descent2? ( 
http://www.dxx-rebirth.com/download/dxx/res/d2xr-opl3-music.dxa ) )
+