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
}
