[gentoo-commits] repo/gentoo:master commit in: games-action/astromenace/
commit: f3364f5b2d31fe5e4985694e0606871ba3507b63
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Apr 29 22:36:22 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Apr 30 07:53:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3364f5b
games-action/astromenace: drop 1.4.1-r1, 1.4.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
games-action/astromenace/Manifest | 1 -
.../astromenace/astromenace-1.4.1-r1.ebuild| 66 --
games-action/astromenace/astromenace-1.4.2.ebuild | 60
3 files changed, 127 deletions(-)
diff --git a/games-action/astromenace/Manifest
b/games-action/astromenace/Manifest
index a564d17b8278..7259423577ea 100644
--- a/games-action/astromenace/Manifest
+++ b/games-action/astromenace/Manifest
@@ -1,2 +1 @@
-DIST astromenace-1.4.1.tar.gz 68041500 BLAKE2B
a6e0c98feae200440bc3e3bd0e3338325ce7953f4e4241d69e1d3b6cc3aaef54c1966f62b08a27aef2a6f6b1ee028e8c7c78788aabc2622bcc1eeab10186c428
SHA512
408fd8a9fcc51d0cdfd31d77bc1c05b079b3248622a252e73e1145db9715b3a331eef5fde295c3390143fb7bb2f88460d374eddea719b6452577bf5e83bd14c1
DIST astromenace-1.4.2.tar.gz 68061933 BLAKE2B
79511ee920eb182a428688a22b5adaa7719d574ffbd9807ebea46a036ea7de85f87aee8f927cfb8458178ed8b9c4ad61dad281196469cf6f648aa6580303fff6
SHA512
6a41c987295ff7201b2a9fa748b2b246c5d61bf4ae39668e614fbec377abfe08387a66182059c0e87d1c8395aa224ae396535b0f41a0be720fc57d319249e8b0
diff --git a/games-action/astromenace/astromenace-1.4.1-r1.ebuild
b/games-action/astromenace/astromenace-1.4.1-r1.ebuild
deleted file mode 100644
index 99cca3528267..
--- a/games-action/astromenace/astromenace-1.4.1-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop xdg-utils
-
-DESCRIPTION="Hardcore 3D space scroll-shooter with spaceship upgrade
possibilities"
-HOMEPAGE="https://viewizard.com;
-SRC_URI="https://github.com/viewizard/astromenace/archive/v${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="GPL-3 GPL-3+ CC-BY-SA-4.0 OFL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
- media-libs/freealut
- media-libs/freetype:2
- media-libs/libogg
- media-libs/libsdl2[joystick,video]
- media-libs/libvorbis
- media-libs/openal
- virtual/glu
- virtual/opengl
- x11-libs/libXinerama"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- cmake_src_prepare
-
- # no messing with CXXFLAGS please.
- sed -i -e '/-Os/d' CMakeLists.txt || die
-}
-
-src_configure() {
- local mycmakeargs=( -DDATADIR="${EPREFIX}/usr/share/${PN}" )
-
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
-}
-
-src_install() {
- dobin "${BUILD_DIR}"/astromenace
-
- insinto /usr/share/${PN}
- doins "${BUILD_DIR}"/gamedata.vfs
-
- newicon -s 128 share/astromenace_128.png ${PN}.png
- newicon -s 64 share/astromenace_64.png ${PN}.png
-
- einstalldocs
-
- make_desktop_entry "${PN}" AstroMenace
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
diff --git a/games-action/astromenace/astromenace-1.4.2.ebuild
b/games-action/astromenace/astromenace-1.4.2.ebuild
deleted file mode 100644
index a08affa86133..
--- a/games-action/astromenace/astromenace-1.4.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop xdg
-
-DESCRIPTION="Hardcore 3D space scroll-shooter with spaceship upgrade
possibilities"
-HOMEPAGE="https://viewizard.com;
-SRC_URI="https://github.com/viewizard/astromenace/archive/v${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="GPL-3 GPL-3+ CC-BY-SA-4.0 OFL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
- media-libs/freealut
- media-libs/freetype:2
- media-libs/libogg
- media-libs/libsdl2[joystick,video]
- media-libs/libvorbis
- media-libs/openal
- virtual/glu
- virtual/opengl
- x11-libs/libXinerama
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.4.2-gcc13.patch
-)
-
-src_prepare() {
- cmake_src_prepare
-
- # no messing with CXXFLAGS please.
- sed -i -e '/-Os/d' CMakeLists.txt || die
-}
-
-src_configure() {
- local mycmakeargs=( -DDATADIR="${EPREFIX}/usr/share/${PN}" )
-
- cmake_src_configure
-}
-
-src_install() {
- # As of 1.4.2, the CMake install target is better, but still needs
porting
- # to GNUInstallDirs.
- dobin "${BUILD_DIR}"/astromenace
-
- insinto /usr/share/${PN}
- doins "${BUILD_DIR}"/gamedata.vfs
-
- newicon -s 128 share/astromenace_128.png ${PN}.png
- newicon -s 64 share/astromenace_64.png ${PN}.png
-
- einstalldocs
-
-
[gentoo-commits] repo/gentoo:master commit in: games-action/astromenace/, games-action/astromenace/files/
commit: e956e4b31cb514f0ec71c993b5e84eba75a92ec0
Author: Sam James gentoo org>
AuthorDate: Sat Apr 29 06:56:25 2023 +
Commit: Sam James gentoo org>
CommitDate: Sat Apr 29 07:08:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e956e4b3
games-action/astromenace: backport ODR fix
Closes: https://bugs.gentoo.org/858515
Signed-off-by: Sam James gentoo.org>
.../astromenace/astromenace-1.4.2-r1.ebuild| 61 +++
.../astromenace/files/astromenace-1.4.2-odr.patch | 203 +
2 files changed, 264 insertions(+)
diff --git a/games-action/astromenace/astromenace-1.4.2-r1.ebuild
b/games-action/astromenace/astromenace-1.4.2-r1.ebuild
new file mode 100644
index ..0a7245e6d20e
--- /dev/null
+++ b/games-action/astromenace/astromenace-1.4.2-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop xdg
+
+DESCRIPTION="Hardcore 3D space scroll-shooter with spaceship upgrade
possibilities"
+HOMEPAGE="https://viewizard.com;
+SRC_URI="https://github.com/viewizard/astromenace/archive/v${PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="GPL-3 GPL-3+ CC-BY-SA-4.0 OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+ media-libs/freealut
+ media-libs/freetype:2
+ media-libs/libogg
+ media-libs/libsdl2[joystick,video]
+ media-libs/libvorbis
+ media-libs/openal
+ virtual/glu
+ virtual/opengl
+ x11-libs/libXinerama
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-gcc13.patch
+ "${FILESDIR}"/${P}-odr.patch
+)
+
+src_prepare() {
+ cmake_src_prepare
+
+ # no messing with CXXFLAGS please.
+ sed -i -e '/-Os/d' CMakeLists.txt || die
+}
+
+src_configure() {
+ local mycmakeargs=( -DDATADIR="${EPREFIX}/usr/share/${PN}" )
+
+ cmake_src_configure
+}
+
+src_install() {
+ # As of 1.4.2, the CMake install target is better, but still needs
porting
+ # to GNUInstallDirs.
+ dobin "${BUILD_DIR}"/astromenace
+
+ insinto /usr/share/${PN}
+ doins "${BUILD_DIR}"/gamedata.vfs
+
+ newicon -s 128 share/astromenace_128.png ${PN}.png
+ newicon -s 64 share/astromenace_64.png ${PN}.png
+
+ einstalldocs
+
+ make_desktop_entry "${PN}" AstroMenace
+}
diff --git a/games-action/astromenace/files/astromenace-1.4.2-odr.patch
b/games-action/astromenace/files/astromenace-1.4.2-odr.patch
new file mode 100644
index ..974edab4c0d3
--- /dev/null
+++ b/games-action/astromenace/files/astromenace-1.4.2-odr.patch
@@ -0,0 +1,203 @@
+From 710b35e786e5fe940a00b59c17eb638ec05a7a97 Mon Sep 17 00:00:00 2001
+From: Mikhail Kurinnoi
+Date: Fri, 28 Apr 2023 20:31:57 +0300
+Subject: [PATCH] Fix "violates the C++ One Definition Rule errors" during
+ build. Related to https://bugs.gentoo.org/858515
+
+---
+ CMakeLists.txt | 1 +
+ src/menu/dialog.cpp | 10 +++---
+ src/menu/menu_information.cpp | 8 ++---
+ src/menu/menu_workshop_weaponry.cpp | 53 -
+ 4 files changed, 40 insertions(+), 32 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 80210a66..7902931b 100755
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -190,6 +190,7 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra")
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Weffc++")
+ #SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wconversion")
++#SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flto -Werror=odr
-Werror=lto-type-mismatch -Werror=strict-aliasing")
+
+ # AppleClang 8.1.0.8020042 don't support this flag
+ IF(NOT (MACOS AND ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")))
+diff --git a/src/menu/dialog.cpp b/src/menu/dialog.cpp
+index a2e0469f..68da945c 100644
+--- a/src/menu/dialog.cpp
b/src/menu/dialog.cpp
+@@ -71,16 +71,16 @@ float StartHideTransp = 1.0f;
+ // what should draw in dialogue 6,7,8
+ std::weak_ptr DialogSpaceShip{};
+ extern std::weak_ptr WorkshopFighterGame; // player's ship
"holder" in shipyard menu
+-char *GetShipGroupTitle(int Num);
+-char *GetWorkshopShipName(int Num);
++const char *GetShipGroupTitle(int Num);
++const char *GetWorkshopShipName(int Num);
+
+ cWeapon *DialogWeapon = nullptr;
+-char *GetWeaponName(int Num);
+-char *GetWeaponGroupTitle(int Num);
++const char *GetWeaponName(int Num);
++const char *GetWeaponGroupTitle(int Num);
+
+ // internal system number... 1-20
+ int DialogSystem = 0;
+-char *GetSystemName(int Num);
++const char *GetSystemName(int Num);
+ float GetShipEngineSystemEnergyUse(int Num);
+ float GetShipProtectionSystemEnergyUse(int Num);
+ float GetShipRechargeEnergy(int Num);
+diff --git a/src/menu/menu_information.cpp b/src/menu/menu_information.cpp
+index ee41014e..8579a49b 100644
+--- a/src/menu/menu_information.cpp
b/src/menu/menu_information.cpp
+@@ -53,10 +53,10 @@
[gentoo-commits] repo/gentoo:master commit in: games-action/astromenace/
commit: dc5e7435c987e52f7549dff6e08819f5a5b3abcd Author: Sam James gentoo org> AuthorDate: Thu Apr 13 02:28:51 2023 + Commit: Sam James gentoo org> CommitDate: Thu Apr 13 02:28:51 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc5e7435 games-action/astromenace: add github upstream metadata Signed-off-by: Sam James gentoo.org> games-action/astromenace/metadata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/games-action/astromenace/metadata.xml b/games-action/astromenace/metadata.xml index f1f76fd0b0cf..2641a5aadc82 100644 --- a/games-action/astromenace/metadata.xml +++ b/games-action/astromenace/metadata.xml @@ -7,5 +7,6 @@ openastromenace + viewizard/astromenace
[gentoo-commits] repo/gentoo:master commit in: games-action/astromenace/files/, games-action/astromenace/
commit: 51229e361acfee1e689f0072ae445d12b7b6dd4f
Author: Sam James gentoo org>
AuthorDate: Thu Apr 13 02:55:12 2023 +
Commit: Sam James gentoo org>
CommitDate: Thu Apr 13 02:55:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51229e36
games-action/astromenace: add 1.4.2
Signed-off-by: Sam James gentoo.org>
games-action/astromenace/Manifest | 1 +
games-action/astromenace/astromenace-1.4.2.ebuild | 60 ++
.../files/astromenace-1.4.2-gcc13.patch| 49 ++
3 files changed, 110 insertions(+)
diff --git a/games-action/astromenace/Manifest
b/games-action/astromenace/Manifest
index f36cdef8d3ff..a564d17b8278 100644
--- a/games-action/astromenace/Manifest
+++ b/games-action/astromenace/Manifest
@@ -1 +1,2 @@
DIST astromenace-1.4.1.tar.gz 68041500 BLAKE2B
a6e0c98feae200440bc3e3bd0e3338325ce7953f4e4241d69e1d3b6cc3aaef54c1966f62b08a27aef2a6f6b1ee028e8c7c78788aabc2622bcc1eeab10186c428
SHA512
408fd8a9fcc51d0cdfd31d77bc1c05b079b3248622a252e73e1145db9715b3a331eef5fde295c3390143fb7bb2f88460d374eddea719b6452577bf5e83bd14c1
+DIST astromenace-1.4.2.tar.gz 68061933 BLAKE2B
79511ee920eb182a428688a22b5adaa7719d574ffbd9807ebea46a036ea7de85f87aee8f927cfb8458178ed8b9c4ad61dad281196469cf6f648aa6580303fff6
SHA512
6a41c987295ff7201b2a9fa748b2b246c5d61bf4ae39668e614fbec377abfe08387a66182059c0e87d1c8395aa224ae396535b0f41a0be720fc57d319249e8b0
diff --git a/games-action/astromenace/astromenace-1.4.2.ebuild
b/games-action/astromenace/astromenace-1.4.2.ebuild
new file mode 100644
index ..a08affa86133
--- /dev/null
+++ b/games-action/astromenace/astromenace-1.4.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop xdg
+
+DESCRIPTION="Hardcore 3D space scroll-shooter with spaceship upgrade
possibilities"
+HOMEPAGE="https://viewizard.com;
+SRC_URI="https://github.com/viewizard/astromenace/archive/v${PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="GPL-3 GPL-3+ CC-BY-SA-4.0 OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+ media-libs/freealut
+ media-libs/freetype:2
+ media-libs/libogg
+ media-libs/libsdl2[joystick,video]
+ media-libs/libvorbis
+ media-libs/openal
+ virtual/glu
+ virtual/opengl
+ x11-libs/libXinerama
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.4.2-gcc13.patch
+)
+
+src_prepare() {
+ cmake_src_prepare
+
+ # no messing with CXXFLAGS please.
+ sed -i -e '/-Os/d' CMakeLists.txt || die
+}
+
+src_configure() {
+ local mycmakeargs=( -DDATADIR="${EPREFIX}/usr/share/${PN}" )
+
+ cmake_src_configure
+}
+
+src_install() {
+ # As of 1.4.2, the CMake install target is better, but still needs
porting
+ # to GNUInstallDirs.
+ dobin "${BUILD_DIR}"/astromenace
+
+ insinto /usr/share/${PN}
+ doins "${BUILD_DIR}"/gamedata.vfs
+
+ newicon -s 128 share/astromenace_128.png ${PN}.png
+ newicon -s 64 share/astromenace_64.png ${PN}.png
+
+ einstalldocs
+
+ make_desktop_entry "${PN}" AstroMenace
+}
diff --git a/games-action/astromenace/files/astromenace-1.4.2-gcc13.patch
b/games-action/astromenace/files/astromenace-1.4.2-gcc13.patch
new file mode 100644
index ..e9615431ca5d
--- /dev/null
+++ b/games-action/astromenace/files/astromenace-1.4.2-gcc13.patch
@@ -0,0 +1,49 @@
+https://github.com/viewizard/astromenace/pull/35
+
+From e5ec662f520621cc5cf685de974a265fc78b3c8e Mon Sep 17 00:00:00 2001
+From: Sam James
+Date: Thu, 13 Apr 2023 03:33:27 +0100
+Subject: [PATCH] Fix build with GCC 13
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+GCC 13 (as usual for new compiler releases) shuffles around some internal
includes and so etc is no longer transitively included:
+```
+/var/tmp/portage/games-action/astromenace-1.4.2/work/astromenace-1.4.2/src/core/model3d/model3d.cpp:
In member function ‘bool viewizard::cModel3DWrapper::LoadVW3D(const
std::string&)’:
+/var/tmp/portage/games-action/astromenace-1.4.2/work/astromenace-1.4.2/src/core/model3d/model3d.cpp:602:10:
error: ‘uint32_t’ is not a member of ‘std’; did you mean ‘wint_t’?
+ 602 | std::uint32_t ChunkArraySize;
+ | ^~~~
+ | wint_t
+/var/tmp/portage/games-action/astromenace-1.4.2/work/astromenace-1.4.2/src/core/model3d/model3d.cpp:603:18:
error: ‘ChunkArraySize’ was not declared in this scope
+ 603 | File->fread(, sizeof(ChunkArraySize), 1);
+ | ^~
+/var/tmp/portage/games-action/astromenace-1.4.2/work/astromenace-1.4.2/src/core/model3d/model3d.cpp:
In member function ‘bool viewizard::cModel3DWrapper::SaveVW3D(const
std::string&)’:
+/var/tmp/portage/games-action/astromenace-1.4.2/work/astromenace-1.4.2/src/core/model3d/model3d.cpp:681:10:
error:
[gentoo-commits] repo/gentoo:master commit in: games-action/astromenace/
commit: f5ee7d879a41dd4ba5e62ae724fd30e07fb943a0 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jul 22 21:22:30 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Jul 22 21:22:44 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5ee7d87 games-action/astromenace: Actually really drop libsdl2[X] dep Package-Manager: Portage-3.0.0, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner gentoo.org> games-action/astromenace/astromenace-1.4.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games-action/astromenace/astromenace-1.4.1-r1.ebuild b/games-action/astromenace/astromenace-1.4.1-r1.ebuild index 3723df9b1a5..99cca352826 100644 --- a/games-action/astromenace/astromenace-1.4.1-r1.ebuild +++ b/games-action/astromenace/astromenace-1.4.1-r1.ebuild @@ -18,7 +18,7 @@ DEPEND=" media-libs/freealut media-libs/freetype:2 media-libs/libogg - media-libs/libsdl2[joystick,video,X] + media-libs/libsdl2[joystick,video] media-libs/libvorbis media-libs/openal virtual/glu
[gentoo-commits] repo/gentoo:master commit in: games-action/astromenace/
commit: df05439befb910ed7e812484ba9322d12cf629a0
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Jul 22 18:15:38 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Jul 22 21:17:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df05439b
games-action/astromenace: Drop 1.4.1 (r0)
Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner gentoo.org>
games-action/astromenace/astromenace-1.4.1.ebuild | 65 ---
1 file changed, 65 deletions(-)
diff --git a/games-action/astromenace/astromenace-1.4.1.ebuild
b/games-action/astromenace/astromenace-1.4.1.ebuild
deleted file mode 100644
index c5ebfee106c..000
--- a/games-action/astromenace/astromenace-1.4.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop xdg-utils
-
-DESCRIPTION="Hardcore 3D space scroll-shooter with spaceship upgrade
possibilities"
-HOMEPAGE="https://viewizard.com;
-SRC_URI="https://github.com/viewizard/astromenace/archive/v${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="GPL-3 GPL-3+ CC-BY-SA-4.0 OFL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/freealut
- media-libs/freetype:2
- media-libs/libogg
- media-libs/libsdl[joystick,video,X]
- media-libs/libvorbis
- media-libs/openal
- virtual/glu
- virtual/opengl
- x11-libs/libXinerama"
-RDEPEND=${DEPEND}
-
-src_prepare() {
- cmake_src_prepare
-
- # no messing with CXXFLAGS please.
- sed -i -e '/-Os/d' CMakeLists.txt || die
-}
-
-src_configure() {
- local mycmakeargs=( -DDATADIR="${EPREFIX}/usr/share/${PN}" )
-
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
-}
-
-src_install() {
- dobin "${BUILD_DIR}"/astromenace
-
- insinto /usr/share/${PN}
- doins "${BUILD_DIR}"/gamedata.vfs
-
- newicon -s 128 share/astromenace_128.png ${PN}.png
- newicon -s 64 share/astromenace_64.png ${PN}.png
-
- einstalldocs
-
- make_desktop_entry "${PN}" AstroMenace
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
[gentoo-commits] repo/gentoo:master commit in: games-action/astromenace/
commit: 5c4990aaf5ff5c8a95517d080bdd0a90232dc0df
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Jul 22 18:15:15 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Jul 22 21:16:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c4990aa
games-action/astromenace: Depends on media-libs/libsdl2
Dropping media-libs/libsdl2[X] USE-dep on request of games proj.
Closes: https://bugs.gentoo.org/732678
Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../astromenace/astromenace-1.4.1-r1.ebuild| 66 ++
1 file changed, 66 insertions(+)
diff --git a/games-action/astromenace/astromenace-1.4.1-r1.ebuild
b/games-action/astromenace/astromenace-1.4.1-r1.ebuild
new file mode 100644
index 000..3723df9b1a5
--- /dev/null
+++ b/games-action/astromenace/astromenace-1.4.1-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake desktop xdg-utils
+
+DESCRIPTION="Hardcore 3D space scroll-shooter with spaceship upgrade
possibilities"
+HOMEPAGE="https://viewizard.com;
+SRC_URI="https://github.com/viewizard/astromenace/archive/v${PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="GPL-3 GPL-3+ CC-BY-SA-4.0 OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ media-libs/freealut
+ media-libs/freetype:2
+ media-libs/libogg
+ media-libs/libsdl2[joystick,video,X]
+ media-libs/libvorbis
+ media-libs/openal
+ virtual/glu
+ virtual/opengl
+ x11-libs/libXinerama"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ cmake_src_prepare
+
+ # no messing with CXXFLAGS please.
+ sed -i -e '/-Os/d' CMakeLists.txt || die
+}
+
+src_configure() {
+ local mycmakeargs=( -DDATADIR="${EPREFIX}/usr/share/${PN}" )
+
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+}
+
+src_install() {
+ dobin "${BUILD_DIR}"/astromenace
+
+ insinto /usr/share/${PN}
+ doins "${BUILD_DIR}"/gamedata.vfs
+
+ newicon -s 128 share/astromenace_128.png ${PN}.png
+ newicon -s 64 share/astromenace_64.png ${PN}.png
+
+ einstalldocs
+
+ make_desktop_entry "${PN}" AstroMenace
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}
[gentoo-commits] repo/gentoo:master commit in: games-action/astromenace/
commit: f79208759dae09d5714284f2890d0eb4487014c6
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Jul 11 19:54:16 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Jul 11 22:11:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7920875
games-action/astromenace: Drop 1.3.2-r1
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner gentoo.org>
games-action/astromenace/Manifest | 1 -
.../astromenace/astromenace-1.3.2-r1.ebuild| 74 --
2 files changed, 75 deletions(-)
diff --git a/games-action/astromenace/Manifest
b/games-action/astromenace/Manifest
index 7ae1e15a2fd..f36cdef8d3f 100644
--- a/games-action/astromenace/Manifest
+++ b/games-action/astromenace/Manifest
@@ -1,2 +1 @@
-DIST astromenace-1.3.2.tar.gz 64643636 BLAKE2B
f3b7dfbeeed56eab8946e122bebf98baa37b7a3e4291007d4f0bb12a220c26ded063f51fcd6f529c9f00cd4b6172d37dcb0798d41e553c682556ba7f4243bce7
SHA512
dd24dc80e0a6b1d47a5e6874ee8aac58790518ef7a910573b6fd7a71541cd811774a8607e6c175c51fb03983d0799db7acbafb79b167dee3bdb79ff6168c1451
DIST astromenace-1.4.1.tar.gz 68041500 BLAKE2B
a6e0c98feae200440bc3e3bd0e3338325ce7953f4e4241d69e1d3b6cc3aaef54c1966f62b08a27aef2a6f6b1ee028e8c7c78788aabc2622bcc1eeab10186c428
SHA512
408fd8a9fcc51d0cdfd31d77bc1c05b079b3248622a252e73e1145db9715b3a331eef5fde295c3390143fb7bb2f88460d374eddea719b6452577bf5e83bd14c1
diff --git a/games-action/astromenace/astromenace-1.3.2-r1.ebuild
b/games-action/astromenace/astromenace-1.3.2-r1.ebuild
deleted file mode 100644
index 66ea563b64b..000
--- a/games-action/astromenace/astromenace-1.3.2-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils desktop gnome2-utils
-
-DESCRIPTION="Hardcore 3D space scroll-shooter with spaceship upgrade
possibilities"
-HOMEPAGE="https://viewizard.com;
-SRC_URI="https://github.com/viewizard/${PN}/archive/v${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="GPL-3 GPL-3+ CC-BY-SA-3.0 UbuntuFontLicense-1.0 OFL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
- media-libs/freealut
- media-libs/freetype:2
- media-libs/libogg
- media-libs/libsdl[joystick,video,X]
- media-libs/libvorbis
- media-libs/openal
- virtual/glu
- virtual/opengl
- x11-libs/libXinerama"
-RDEPEND=${DEPEND}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # no messing with CXXFLAGS please.
- sed -i -e '/-Os/d' CMakeLists.txt || die
-}
-
-src_configure() {
- local mycmakeargs=("-DDATADIR=/usr/share/${PN}")
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
-
- "${CMAKE_BUILD_DIR}"/AstroMenace --pack \
- --rawdata="${S}"/RAW_VFS_DATA \
- --dir=$(dirname "${CMAKE_BUILD_DIR}") || die
-}
-
-src_install() {
- newbin "${CMAKE_BUILD_DIR}"/AstroMenace "${PN}"
-
- insinto /usr/share/${PN}
- doins ../*.vfs
-
- newicon -s 128 astromenace_128.png ${PN}.png
- newicon -s 64 astromenace_64.png ${PN}.png
-
- dodoc ChangeLog.txt ReadMe.txt
-
- make_desktop_entry "${PN}" AstroMenace
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
[gentoo-commits] repo/gentoo:master commit in: games-action/astromenace/
commit: 09f96341b549a85ccea20801325d91ca47817cc2
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Jul 11 19:53:54 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Jul 11 22:11:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09f96341
games-action/astromenace: Switch to cmake.eclass
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner gentoo.org>
games-action/astromenace/astromenace-1.4.1.ebuild | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/games-action/astromenace/astromenace-1.4.1.ebuild
b/games-action/astromenace/astromenace-1.4.1.ebuild
index 3300882e709..c5ebfee106c 100644
--- a/games-action/astromenace/astromenace-1.4.1.ebuild
+++ b/games-action/astromenace/astromenace-1.4.1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit cmake-utils desktop xdg-utils
+inherit cmake desktop xdg-utils
DESCRIPTION="Hardcore 3D space scroll-shooter with spaceship upgrade
possibilities"
HOMEPAGE="https://viewizard.com;
@@ -26,7 +26,7 @@ DEPEND="media-libs/freealut
RDEPEND=${DEPEND}
src_prepare() {
- cmake-utils_src_prepare
+ cmake_src_prepare
# no messing with CXXFLAGS please.
sed -i -e '/-Os/d' CMakeLists.txt || die
@@ -35,11 +35,11 @@ src_prepare() {
src_configure() {
local mycmakeargs=( -DDATADIR="${EPREFIX}/usr/share/${PN}" )
- cmake-utils_src_configure
+ cmake_src_configure
}
src_compile() {
- cmake-utils_src_compile
+ cmake_src_compile
}
src_install() {
@@ -51,7 +51,7 @@ src_install() {
newicon -s 128 share/astromenace_128.png ${PN}.png
newicon -s 64 share/astromenace_64.png ${PN}.png
- dodoc CHANGELOG.md README.md
+ einstalldocs
make_desktop_entry "${PN}" AstroMenace
}
[gentoo-commits] repo/gentoo:master commit in: games-action/astromenace/
commit: 4d4eba99e1379b9a7b5b9cc96abdf42059a764fe
Author: Stefan Strogin gentoo org>
AuthorDate: Mon Feb 10 21:31:22 2020 +
Commit: Stefan Strogin gentoo org>
CommitDate: Mon Feb 10 21:31:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d4eba99
games-action/astromenace: version bump to 1.4.1
Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Stefan Strogin gentoo.org>
games-action/astromenace/Manifest | 1 +
games-action/astromenace/astromenace-1.4.1.ebuild | 65 +++
2 files changed, 66 insertions(+)
diff --git a/games-action/astromenace/Manifest
b/games-action/astromenace/Manifest
index 8af169359cd..7ae1e15a2fd 100644
--- a/games-action/astromenace/Manifest
+++ b/games-action/astromenace/Manifest
@@ -1 +1,2 @@
DIST astromenace-1.3.2.tar.gz 64643636 BLAKE2B
f3b7dfbeeed56eab8946e122bebf98baa37b7a3e4291007d4f0bb12a220c26ded063f51fcd6f529c9f00cd4b6172d37dcb0798d41e553c682556ba7f4243bce7
SHA512
dd24dc80e0a6b1d47a5e6874ee8aac58790518ef7a910573b6fd7a71541cd811774a8607e6c175c51fb03983d0799db7acbafb79b167dee3bdb79ff6168c1451
+DIST astromenace-1.4.1.tar.gz 68041500 BLAKE2B
a6e0c98feae200440bc3e3bd0e3338325ce7953f4e4241d69e1d3b6cc3aaef54c1966f62b08a27aef2a6f6b1ee028e8c7c78788aabc2622bcc1eeab10186c428
SHA512
408fd8a9fcc51d0cdfd31d77bc1c05b079b3248622a252e73e1145db9715b3a331eef5fde295c3390143fb7bb2f88460d374eddea719b6452577bf5e83bd14c1
diff --git a/games-action/astromenace/astromenace-1.4.1.ebuild
b/games-action/astromenace/astromenace-1.4.1.ebuild
new file mode 100644
index 000..3300882e709
--- /dev/null
+++ b/games-action/astromenace/astromenace-1.4.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils desktop xdg-utils
+
+DESCRIPTION="Hardcore 3D space scroll-shooter with spaceship upgrade
possibilities"
+HOMEPAGE="https://viewizard.com;
+SRC_URI="https://github.com/viewizard/astromenace/archive/v${PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="GPL-3 GPL-3+ CC-BY-SA-4.0 OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="media-libs/freealut
+ media-libs/freetype:2
+ media-libs/libogg
+ media-libs/libsdl[joystick,video,X]
+ media-libs/libvorbis
+ media-libs/openal
+ virtual/glu
+ virtual/opengl
+ x11-libs/libXinerama"
+RDEPEND=${DEPEND}
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ # no messing with CXXFLAGS please.
+ sed -i -e '/-Os/d' CMakeLists.txt || die
+}
+
+src_configure() {
+ local mycmakeargs=( -DDATADIR="${EPREFIX}/usr/share/${PN}" )
+
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+}
+
+src_install() {
+ dobin "${BUILD_DIR}"/astromenace
+
+ insinto /usr/share/${PN}
+ doins "${BUILD_DIR}"/gamedata.vfs
+
+ newicon -s 128 share/astromenace_128.png ${PN}.png
+ newicon -s 64 share/astromenace_64.png ${PN}.png
+
+ dodoc CHANGELOG.md README.md
+
+ make_desktop_entry "${PN}" AstroMenace
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}
