[gentoo-commits] repo/gentoo:master commit in: games-arcade/asteroid/, games-arcade/asteroid/files/

[gentoo-commits] repo/gentoo:master commit in: games-arcade/asteroid/, games-arcade/asteroid/files/

[Pacho Ramos]

commit:     13bf38dc1bb2137db7e4fabec04b85a38e19ba74
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 15 09:10:56 2018 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Apr 15 09:11:30 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13bf38dc

games-arcade/asteroid: Drop old

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 games-arcade/asteroid/Manifest                     |  1 -
 games-arcade/asteroid/asteroid-1.1.ebuild          | 31 ----------------------
 .../asteroid/files/asteroid-1.1-include.patch      | 11 --------
 3 files changed, 43 deletions(-)

diff --git a/games-arcade/asteroid/Manifest b/games-arcade/asteroid/Manifest
index 2077dbfba54..62aa2d4fb6c 100644
--- a/games-arcade/asteroid/Manifest
+++ b/games-arcade/asteroid/Manifest
@@ -1,2 +1 @@
 DIST 1.2.1.tar.gz 307596 BLAKE2B c3f5363a0939cc4644425adfa9c3f2ca47ec04ae1beb9dd381fba912ee5e9d3330727fa82d4749b4f6402254988feaaaaef10f7f72aeea691656a1dd188ad5e2 SHA512 a88e0b85264d72bd40add0f3fc8b2b727b1acc0c190de6a60d4e1c79adcc484b17d0ed3537309b704667a6617f387219144cbec93df4fbff585d1237a9823b37
-DIST asteroid-1.1.tar.bz2 386177 BLAKE2B c06470f16df0a534a3418b2f5730479f5f1a9ef7b05bbf91539d31b1eaf8ec578f81f6fc0c45a6372bf9fc873065e58c87d53413b09d2faa970e967a8543c442 SHA512 f3acae27a7c3296b6b9e9fc9aabf8c101cd020bfbf2065d2b4f5fabf14f7555c70b2e4543c2c661f0e4410b8128936eb1e0db930d7376c3a3bb3a898ce4ed4e4

diff --git a/games-arcade/asteroid/asteroid-1.1.ebuild b/games-arcade/asteroid/asteroid-1.1.ebuild
deleted file mode 100644
index f3284e2aa12..00000000000
--- a/games-arcade/asteroid/asteroid-1.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="A modern version of the arcade classic that uses OpenGL"
-HOMEPAGE="http://chaoslizard.sourceforge.net/asteroid/"
-SRC_URI="mirror://sourceforge/chaoslizard/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="virtual/opengl
-	media-libs/freeglut
-	virtual/glu
-	media-libs/libsdl
-	media-libs/sdl-mixer"
-RDEPEND=${DEPEND}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-include.patch
-}
-
-src_install() {
-	DOCS="$(echo asteroid-{authors,changes,readme}.txt)" \
-		default
-	prepgamesdirs
-}

diff --git a/games-arcade/asteroid/files/asteroid-1.1-include.patch b/games-arcade/asteroid/files/asteroid-1.1-include.patch
deleted file mode 100644
index 9eca5f83f2c..00000000000
--- a/games-arcade/asteroid/files/asteroid-1.1-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/hiscore.c
-+++ src/hiscore.c
-@@ -35,6 +35,8 @@
- 
- #include <stdio.h>
- #include <ctype.h>
-+#include <stdlib.h>
-+#include <string.h>
- 
- #include "main.h"
- #include "hiscore.h"

[gentoo-commits] repo/gentoo:master commit in: games-arcade/asteroid/, games-arcade/asteroid/files/

[Sam James]

commit:     3aa0fa647db17302e5d60bc4e91b9e2b9193923f
Author:     Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Sun Apr 27 00:03:25 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 27 22:52:28 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3aa0fa64

games-arcade/asteroid: update EAPI 7 -> 8, fix build

with gcc 15, cmake 4

Closes: https://bugs.gentoo.org/944250
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Part-of: https://github.com/gentoo/gentoo/pull/41781
Closes: https://github.com/gentoo/gentoo/pull/41781
Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-arcade/asteroid/asteroid-1.2.1-r1.ebuild     | 37 ++++++++++++++++++++++
 .../asteroid/files/asteroid-1.2.1-cmake4.patch     | 12 +++++++
 .../asteroid/files/asteroid-1.2.1-gcc15.patch      | 13 ++++++++
 3 files changed, 62 insertions(+)

diff --git a/games-arcade/asteroid/asteroid-1.2.1-r1.ebuild b/games-arcade/asteroid/asteroid-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..021d0cd502f8
--- /dev/null
+++ b/games-arcade/asteroid/asteroid-1.2.1-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Modern version of the arcade classic that uses OpenGL"
+HOMEPAGE="https://chazomaticus.github.io/asteroid/"
+SRC_URI="https://github.com/chazomaticus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	media-libs/freeglut
+	media-libs/libsdl
+	media-libs/sdl-mixer
+	virtual/glu
+	virtual/opengl
+	x11-libs/gtk+:2
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-libm.patch
+	"${FILESDIR}"/${P}-cmake4.patch
+	"${FILESDIR}"/${P}-gcc15.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DOpenGL_GL_PREFERENCE=GLVND
+	)
+	cmake_src_configure
+}

diff --git a/games-arcade/asteroid/files/asteroid-1.2.1-cmake4.patch b/games-arcade/asteroid/files/asteroid-1.2.1-cmake4.patch
new file mode 100644
index 000000000000..2c126544283b
--- /dev/null
+++ b/games-arcade/asteroid/files/asteroid-1.2.1-cmake4.patch
@@ -0,0 +1,12 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,8 +1,8 @@
++cmake_minimum_required(VERSION 3.31)
+ project(Asteroid)
+ set(Asteroid_BUILD_VERSION "1.2.1")
+ 
+ # Dependencies
+-cmake_minimum_required(VERSION 2.6)
+ find_package(OpenGL REQUIRED)
+ if(NOT OPENGL_FOUND)
+    message(FATAL_ERROR "Error: OpenGL not found")

diff --git a/games-arcade/asteroid/files/asteroid-1.2.1-gcc15.patch b/games-arcade/asteroid/files/asteroid-1.2.1-gcc15.patch
new file mode 100644
index 000000000000..1520bd5966c5
--- /dev/null
+++ b/games-arcade/asteroid/files/asteroid-1.2.1-gcc15.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/944250
+
+--- a/src/main.c
++++ b/src/main.c
+@@ -244,7 +244,7 @@ void GameTimer(int v)
+ }
+ 
+ #ifdef CFG_GTK
+-static gboolean DisplayDialog()
++static gboolean DisplayDialog(void* a)
+ {
+    GtkWidget * dialog = gtk_message_dialog_new(NULL,
+       GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_OK, ASTEROIDS_ABOUT);