commit: 512fd80296fb5802e845ae849e85781deec19d46
Author: Stefan Strogin <stefan <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 24 12:23:37 2025 +0000
Commit: Stefan Strogin <steils <AT> gentoo <DOT> org>
CommitDate: Mon Nov 24 12:27:38 2025 +0000
URL: https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=512fd802
games-arcade/mars-game: EAPI=8, drop old
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>
.../mars-game/files/mars-game-GNUInstallDirs.patch | 72 ----------------------
games-arcade/mars-game/files/mars-game-glib.patch | 12 ----
games-arcade/mars-game/mars-game-0.7.6.ebuild | 47 --------------
.../mars-game/mars-game-0.7.6_p20211017.ebuild | 6 +-
4 files changed, 3 insertions(+), 134 deletions(-)
diff --git a/games-arcade/mars-game/files/mars-game-GNUInstallDirs.patch
b/games-arcade/mars-game/files/mars-game-GNUInstallDirs.patch
deleted file mode 100644
index 2db85af..0000000
--- a/games-arcade/mars-game/files/mars-game-GNUInstallDirs.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -Naur a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt 2016-01-10 13:40:55.000000000 +0000
-+++ b/CMakeLists.txt 2018-08-27 21:05:53.852400460 +0100
-@@ -20,7 +20,8 @@
- #####################################################################
- # Installation directories
- #####################################################################
--set(mars_DATA_DEST_DIR ${CMAKE_INSTALL_PREFIX}/share/games/marsshooter CACHE
STRING "marsshooter data files destdir")
-+include(GNUInstallDirs)
-+set(mars_DATA_DEST_DIR ${CMAKE_INSTALL_FULL_DATAROOTDIR}/games/marsshooter
CACHE STRING "marsshooter data files destdir")
- set(mars_EXE_DEST_DIR ${CMAKE_INSTALL_PREFIX}/games CACHE STRING "marsshooter
exe destdir")
-
- #####################################################################
-diff -Naur a/src/CMakeLists.txt b/src/CMakeLists.txt
---- a/src/CMakeLists.txt 2016-01-10 13:40:55.000000000 +0000
-+++ b/src/CMakeLists.txt 2018-08-27 21:05:55.467442894 +0100
-@@ -75,7 +75,7 @@
- ${MARS_SOURCE_DIR}/credits.txt
- ${MARS_SOURCE_DIR}/license.txt
- DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/share/doc/marsshooter
-+ ${CMAKE_INSTALL_FULL_DOCDIR}
- )
- install(
- FILES
-@@ -101,40 +101,40 @@
- FILES
- ${MARS_SOURCE_DIR}/resources/marsshooter.png
- DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/512x512/apps
-+
${CMAKE_INSTALL_FULL_DATAROOTDIR}/icons/hicolor/512x512/apps
- )
- install(
- FILES
- ${MARS_SOURCE_DIR}/resources/marsshooter.svg
- DESTINATION
--
${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps
-+
${CMAKE_INSTALL_FULL_DATAROOTDIR}/icons/hicolor/scalable/apps
- )
- install(
- FILES
- ${MARS_SOURCE_DIR}/resources/marsshooter.xpm
- DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/share/pixmaps
-+ ${CMAKE_INSTALL_FULL_DATAROOTDIR}/pixmaps
- )
- # desktop file
- install(
- FILES
- ${MARS_SOURCE_DIR}/resources/marsshooter.desktop
- DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/share/applications
-+ ${CMAKE_INSTALL_FULL_DATAROOTDIR}/applications
- )
- # appdata file
- install(
- FILES
- ${MARS_SOURCE_DIR}/resources/marsshooter.appdata.xml
- DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/share/appdata
-+ ${CMAKE_INSTALL_FULL_DATAROOTDIR}/appdata
- )
- # manpage
- install(
- FILES
- ${MARS_SOURCE_DIR}/resources/marsshooter.6
- DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/share/man/man6
-+ ${CMAKE_INSTALL_FULL_MANDIR}/man6
- )
- #install(
- #FILES
diff --git a/games-arcade/mars-game/files/mars-game-glib.patch
b/games-arcade/mars-game/files/mars-game-glib.patch
deleted file mode 100644
index 58d4a13..0000000
--- a/games-arcade/mars-game/files/mars-game-glib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/CMakeLists.txt 2012-07-13 11:49:06.000000000 +0200
-+++ b/CMakeLists.txt 2012-07-13 11:59:31.590809749 +0200
-@@ -48,6 +48,9 @@
- # Fribidi library needed for bi-directional texts
- find_library(FRIBIDI_LIBRARY fribidi)
-
-+ find_package(PkgConfig)
-+ pkg_check_modules(GLIB glib-2.0)
-+ include_directories(${GLIB_INCLUDE_DIRS})
- # set the executable output path
- if(APPLE)
- set(EXECUTABLE_OUTPUT_PATH ${MARS_BINARY_DIR})
diff --git a/games-arcade/mars-game/mars-game-0.7.6.ebuild
b/games-arcade/mars-game/mars-game-0.7.6.ebuild
deleted file mode 100644
index af1edc8..0000000
--- a/games-arcade/mars-game/mars-game-0.7.6.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake prefix
-
-MY_PN="marsshooter"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="M.A.R.S. a ridiculous shooter"
-HOMEPAGE="http://mars-game.sourceforge.net";
-SRC_URI="https://github.com/jwrdegoede/M.A.R.S./archive/${MY_P}.tar.gz";
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="
- dev-libs/fribidi
- media-libs/libsfml:=
- media-libs/taglib
- virtual/opengl
-"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/M.A.R.S.-${MY_P}"
-
-PATCHES=(
- "${FILESDIR}/${PN}"-{GNUInstallDirs,glib}.patch
-)
-
-src_prepare() {
- cmake_src_prepare
- hprefixify src/System/settings.cpp
-}
-
-src_configure() {
- local mycmakeargs=(
- -Dmars_DATA_DEST_DIR="${EPREFIX}/usr/share/${MY_PN}"
- -Dmars_EXE_DEST_DIR="${EPREFIX}/usr/bin"
- -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
- )
-
- cmake_src_configure
-}
diff --git a/games-arcade/mars-game/mars-game-0.7.6_p20211017.ebuild
b/games-arcade/mars-game/mars-game-0.7.6_p20211017.ebuild
index 0887c57..e075d7a 100644
--- a/games-arcade/mars-game/mars-game-0.7.6_p20211017.ebuild
+++ b/games-arcade/mars-game/mars-game-0.7.6_p20211017.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit cmake prefix
@@ -13,6 +13,8 @@ COMMIT="84664cda094efe6e49d9b1550e4f4f98c33eefa2"
DESCRIPTION="M.A.R.S. a ridiculous shooter"
HOMEPAGE="http://mars-game.sourceforge.net";
SRC_URI="https://github.com/thelaui/M.A.R.S./archive/${COMMIT}.tar.gz ->
${MY_P}.tar.gz"
+S="${WORKDIR}/M.A.R.S.-${COMMIT}"
+
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
@@ -27,8 +29,6 @@ DEPEND="
RDEPEND="${DEPEND}"
BDEPEND="virtual/pkgconfig"
-S="${WORKDIR}/M.A.R.S.-${COMMIT}"
-
src_prepare() {
cmake_src_prepare
hprefixify src/System/settings.cpp
