* [gentoo-commits] proj/gamerlay:master commit in: games-arcade/mars-game/files/, games-arcade/mars-game/
@ 2018-08-27 21:04 James Le Cuirot
0 siblings, 0 replies; 3+ messages in thread
From: James Le Cuirot @ 2018-08-27 21:04 UTC (permalink / raw
To: gentoo-commits
commit: 8499b3a5dd87eea17f2d3f7ede4360c939ffe218
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 27 20:54:50 2018 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Aug 27 21:01:52 2018 +0000
URL: https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=8499b3a5
games-arcade/mars-game: Drop 9999
Upstream and the fork are both quite dead.
Package-Manager: Portage-2.3.48, Repoman-2.3.10
Manifest-Sign-Key: 21C632129C6D7DE4
...s-game-9999-glib.patch => mars-game-glib.patch} | 2 +-
games-arcade/mars-game/mars-game-9999.ebuild | 32 ----------------------
games-arcade/mars-game/metadata.xml | 2 +-
3 files changed, 2 insertions(+), 34 deletions(-)
diff --git a/games-arcade/mars-game/files/mars-game-9999-glib.patch b/games-arcade/mars-game/files/mars-game-glib.patch
similarity index 89%
rename from games-arcade/mars-game/files/mars-game-9999-glib.patch
rename to games-arcade/mars-game/files/mars-game-glib.patch
index 7c3b28d..58d4a13 100644
--- a/games-arcade/mars-game/files/mars-game-9999-glib.patch
+++ b/games-arcade/mars-game/files/mars-game-glib.patch
@@ -6,7 +6,7 @@
+ find_package(PkgConfig)
+ pkg_check_modules(GLIB glib-2.0)
-+ include_directories(${GLIB_INCLUDE_DIRS})
++ 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-9999.ebuild b/games-arcade/mars-game/mars-game-9999.ebuild
deleted file mode 100644
index 8120e15..0000000
--- a/games-arcade/mars-game/mars-game-9999.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils eutils git-r3
-
-DESCRIPTION="M.A.R.S. a ridiculous shooter"
-HOMEPAGE="http://mars-game.sourceforge.net"
-EGIT_REPO_URI="https://github.com/thelaui/M.A.R.S..git"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE="debug"
-
-DEPEND="
- dev-libs/fribidi
- media-libs/libsfml
- media-libs/taglib
- virtual/opengl
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${P}"-glib.patch
-)
-
-src_prepare(){
- sed -i -e "s:{CMAKE_INSTALL_PREFIX}/games:{CMAKE_INSTALL_PREFIX}/games/bin:g" -i src/CMakeLists.txt
- default
-}
diff --git a/games-arcade/mars-game/metadata.xml b/games-arcade/mars-game/metadata.xml
index 5217b80..e21c88e 100644
--- a/games-arcade/mars-game/metadata.xml
+++ b/games-arcade/mars-game/metadata.xml
@@ -1,7 +1,7 @@
<?xml version = '1.0' encoding = 'UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>frostworks@gmx.de</email>
<name>Marcel Unbehaun</name>
</maintainer>
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] proj/gamerlay:master commit in: games-arcade/mars-game/files/, games-arcade/mars-game/
@ 2018-08-27 21:04 James Le Cuirot
0 siblings, 0 replies; 3+ messages in thread
From: James Le Cuirot @ 2018-08-27 21:04 UTC (permalink / raw
To: gentoo-commits
commit: f6eaf77f8bb5851a2b893a782d1fb7556718a446
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 27 20:58:06 2018 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Aug 27 21:02:20 2018 +0000
URL: https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=f6eaf77f
games-arcade/mars-game: Version bump to 0.7.6
This is a fork by Fedora's Hans de Goede. It incorporates various
build fixes. I have also applied my own path fixes.
Package-Manager: Portage-2.3.48, Repoman-2.3.10
Manifest-Sign-Key: 21C632129C6D7DE4
.../mars-game/files/mars-game-GNUInstallDirs.patch | 72 ++++++++++++++++++++++
games-arcade/mars-game/mars-game-0.7.6.ebuild | 50 +++++++++++++++
2 files changed, 122 insertions(+)
diff --git a/games-arcade/mars-game/files/mars-game-GNUInstallDirs.patch b/games-arcade/mars-game/files/mars-game-GNUInstallDirs.patch
new file mode 100644
index 0000000..2db85af
--- /dev/null
+++ b/games-arcade/mars-game/files/mars-game-GNUInstallDirs.patch
@@ -0,0 +1,72 @@
+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/mars-game-0.7.6.ebuild b/games-arcade/mars-game/mars-game-0.7.6.ebuild
new file mode 100644
index 0000000..5e2944c
--- /dev/null
+++ b/games-arcade/mars-game/mars-game-0.7.6.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils 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}"
+
+S="${WORKDIR}/M.A.R.S.-${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}"-{GNUInstallDirs,glib}.patch
+)
+
+src_prepare() {
+ cmake-utils_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-utils_src_configure
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] proj/gamerlay:master commit in: games-arcade/mars-game/files/, games-arcade/mars-game/
@ 2017-06-02 14:38 Vadim A. Misbakh-Soloviov
0 siblings, 0 replies; 3+ messages in thread
From: Vadim A. Misbakh-Soloviov @ 2017-06-02 14:38 UTC (permalink / raw
To: gentoo-commits
commit: ae8839815d5e2d1954b4ad0e0ce25d4f0bb4da0e
Author: Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name>
AuthorDate: Fri Jun 2 14:35:37 2017 +0000
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Fri Jun 2 14:35:37 2017 +0000
URL: https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=ae883981
mars-game: fixes
.../mars-game/files/mars-game-9999-glib.patch | 4 ++--
games-arcade/mars-game/mars-game-0.7.5.ebuild | 28 ++++++++++++++--------
games-arcade/mars-game/mars-game-9999.ebuild | 21 +++++++++-------
3 files changed, 33 insertions(+), 20 deletions(-)
diff --git a/games-arcade/mars-game/files/mars-game-9999-glib.patch b/games-arcade/mars-game/files/mars-game-9999-glib.patch
index e112dd5..7c3b28d 100644
--- a/games-arcade/mars-game/files/mars-game-9999-glib.patch
+++ b/games-arcade/mars-game/files/mars-game-9999-glib.patch
@@ -1,5 +1,5 @@
---- CMakeLists.txt-O 2012-07-13 11:49:06.000000000 +0200
-+++ CMakeLists.txt 2012-07-13 11:59:31.590809749 +0200
+--- 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)
diff --git a/games-arcade/mars-game/mars-game-0.7.5.ebuild b/games-arcade/mars-game/mars-game-0.7.5.ebuild
index fe2bb24..8384fee 100644
--- a/games-arcade/mars-game/mars-game-0.7.5.ebuild
+++ b/games-arcade/mars-game/mars-game-0.7.5.ebuild
@@ -1,29 +1,37 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/mars-game/mars-game-9999.ebuild,v 1.2 2011/09/09 07:52:53 frostwork Exp $
-EAPI=4
+EAPI=6
-inherit cmake-utils eutils
+# No tagged release tarball after github dropped "download"
+EGIT_COMMIT="c855d044094a1d92317e38935d81ba938946132e"
+
+inherit cmake-utils eutils vcs-snapshot
DESCRIPTION="M.A.R.S. a ridiculous shooter"
HOMEPAGE="http://mars-games.sourceforge.net"
-SRC_URI="https://github.com/downloads/thelaui/M.A.R.S./mars_source_${PV}.tar.gz"
+SRC_URI="https://github.com/thelaui/M.A.R.S./archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="debug"
-DEPEND="dev-libs/fribidi
- >=media-libs/libsfml-2.0_rc20120731
+DEPEND="
+ dev-libs/fribidi
+ media-libs/libsfml
media-libs/taglib
- virtual/opengl"
+ virtual/opengl
+"
RDEPEND="${DEPEND}"
-S="${WORKDIR}/${PN}"
+#S="${WORKDIR}/${PN}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-9999-glib.patch"
+)
src_prepare() {
- epatch "${FILESDIR}"/${PN}-9999-glib.patch
sed -i -e "s:{CMAKE_INSTALL_PREFIX}/games:{CMAKE_INSTALL_PREFIX}/games/bin:g" -i src/CMakeLists.txt
+ default
}
diff --git a/games-arcade/mars-game/mars-game-9999.ebuild b/games-arcade/mars-game/mars-game-9999.ebuild
index 902d9f0..8120e15 100644
--- a/games-arcade/mars-game/mars-game-9999.ebuild
+++ b/games-arcade/mars-game/mars-game-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/mars-game/mars-game-9999.ebuild,v 1.2 2011/09/09 07:52:53 frostwork Exp $
-EAPI=4
+EAPI=6
-inherit cmake-utils eutils git-2
+inherit cmake-utils eutils git-r3
DESCRIPTION="M.A.R.S. a ridiculous shooter"
HOMEPAGE="http://mars-game.sourceforge.net"
@@ -15,13 +14,19 @@ SLOT="0"
KEYWORDS=""
IUSE="debug"
-DEPEND="dev-libs/fribidi
- >=media-libs/libsfml-2.0_rc20120731
+DEPEND="
+ dev-libs/fribidi
+ media-libs/libsfml
media-libs/taglib
- virtual/opengl"
+ virtual/opengl
+"
RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}/${P}"-glib.patch
+)
+
src_prepare(){
- epatch "${FILESDIR}"/${P}-glib.patch
sed -i -e "s:{CMAKE_INSTALL_PREFIX}/games:{CMAKE_INSTALL_PREFIX}/games/bin:g" -i src/CMakeLists.txt
+ default
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-08-27 21:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-08-27 21:04 [gentoo-commits] proj/gamerlay:master commit in: games-arcade/mars-game/files/, games-arcade/mars-game/ James Le Cuirot
-- strict thread matches above, loose matches on Subject: below --
2018-08-27 21:04 James Le Cuirot
2017-06-02 14:38 Vadim A. Misbakh-Soloviov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox