| 1 |
commit: ae8839815d5e2d1954b4ad0e0ce25d4f0bb4da0e |
| 2 |
Author: Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name> |
| 3 |
AuthorDate: Fri Jun 2 14:35:37 2017 +0000 |
| 4 |
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name> |
| 5 |
CommitDate: Fri Jun 2 14:35:37 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=ae883981 |
| 7 |
|
| 8 |
mars-game: fixes |
| 9 |
|
| 10 |
.../mars-game/files/mars-game-9999-glib.patch | 4 ++-- |
| 11 |
games-arcade/mars-game/mars-game-0.7.5.ebuild | 28 ++++++++++++++-------- |
| 12 |
games-arcade/mars-game/mars-game-9999.ebuild | 21 +++++++++------- |
| 13 |
3 files changed, 33 insertions(+), 20 deletions(-) |
| 14 |
|
| 15 |
diff --git a/games-arcade/mars-game/files/mars-game-9999-glib.patch b/games-arcade/mars-game/files/mars-game-9999-glib.patch |
| 16 |
index e112dd5..7c3b28d 100644 |
| 17 |
--- a/games-arcade/mars-game/files/mars-game-9999-glib.patch |
| 18 |
+++ b/games-arcade/mars-game/files/mars-game-9999-glib.patch |
| 19 |
@@ -1,5 +1,5 @@ |
| 20 |
---- CMakeLists.txt-O 2012-07-13 11:49:06.000000000 +0200 |
| 21 |
-+++ CMakeLists.txt 2012-07-13 11:59:31.590809749 +0200 |
| 22 |
+--- a/CMakeLists.txt 2012-07-13 11:49:06.000000000 +0200 |
| 23 |
++++ b/CMakeLists.txt 2012-07-13 11:59:31.590809749 +0200 |
| 24 |
@@ -48,6 +48,9 @@ |
| 25 |
# Fribidi library needed for bi-directional texts |
| 26 |
find_library(FRIBIDI_LIBRARY fribidi) |
| 27 |
|
| 28 |
diff --git a/games-arcade/mars-game/mars-game-0.7.5.ebuild b/games-arcade/mars-game/mars-game-0.7.5.ebuild |
| 29 |
index fe2bb24..8384fee 100644 |
| 30 |
--- a/games-arcade/mars-game/mars-game-0.7.5.ebuild |
| 31 |
+++ b/games-arcade/mars-game/mars-game-0.7.5.ebuild |
| 32 |
@@ -1,29 +1,37 @@ |
| 33 |
-# Copyright 1999-2012 Gentoo Foundation |
| 34 |
+# Copyright 1999-2017 Gentoo Foundation |
| 35 |
# Distributed under the terms of the GNU General Public License v2 |
| 36 |
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/mars-game/mars-game-9999.ebuild,v 1.2 2011/09/09 07:52:53 frostwork Exp $ |
| 37 |
|
| 38 |
-EAPI=4 |
| 39 |
+EAPI=6 |
| 40 |
|
| 41 |
-inherit cmake-utils eutils |
| 42 |
+# No tagged release tarball after github dropped "download" |
| 43 |
+EGIT_COMMIT="c855d044094a1d92317e38935d81ba938946132e" |
| 44 |
+ |
| 45 |
+inherit cmake-utils eutils vcs-snapshot |
| 46 |
|
| 47 |
DESCRIPTION="M.A.R.S. a ridiculous shooter" |
| 48 |
HOMEPAGE="http://mars-games.sourceforge.net" |
| 49 |
-SRC_URI="https://github.com/downloads/thelaui/M.A.R.S./mars_source_${PV}.tar.gz" |
| 50 |
+SRC_URI="https://github.com/thelaui/M.A.R.S./archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" |
| 51 |
|
| 52 |
LICENSE="GPL-3" |
| 53 |
SLOT="0" |
| 54 |
KEYWORDS="~amd64 ~x86" |
| 55 |
IUSE="debug" |
| 56 |
|
| 57 |
-DEPEND="dev-libs/fribidi |
| 58 |
- >=media-libs/libsfml-2.0_rc20120731 |
| 59 |
+DEPEND=" |
| 60 |
+ dev-libs/fribidi |
| 61 |
+ media-libs/libsfml |
| 62 |
media-libs/taglib |
| 63 |
- virtual/opengl" |
| 64 |
+ virtual/opengl |
| 65 |
+" |
| 66 |
RDEPEND="${DEPEND}" |
| 67 |
|
| 68 |
-S="${WORKDIR}/${PN}" |
| 69 |
+#S="${WORKDIR}/${PN}" |
| 70 |
+ |
| 71 |
+PATCHES=( |
| 72 |
+ "${FILESDIR}/${PN}-9999-glib.patch" |
| 73 |
+) |
| 74 |
|
| 75 |
src_prepare() { |
| 76 |
- epatch "${FILESDIR}"/${PN}-9999-glib.patch |
| 77 |
sed -i -e "s:{CMAKE_INSTALL_PREFIX}/games:{CMAKE_INSTALL_PREFIX}/games/bin:g" -i src/CMakeLists.txt |
| 78 |
+ default |
| 79 |
} |
| 80 |
|
| 81 |
diff --git a/games-arcade/mars-game/mars-game-9999.ebuild b/games-arcade/mars-game/mars-game-9999.ebuild |
| 82 |
index 902d9f0..8120e15 100644 |
| 83 |
--- a/games-arcade/mars-game/mars-game-9999.ebuild |
| 84 |
+++ b/games-arcade/mars-game/mars-game-9999.ebuild |
| 85 |
@@ -1,10 +1,9 @@ |
| 86 |
-# Copyright 1999-2012 Gentoo Foundation |
| 87 |
+# Copyright 1999-2017 Gentoo Foundation |
| 88 |
# Distributed under the terms of the GNU General Public License v2 |
| 89 |
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/mars-game/mars-game-9999.ebuild,v 1.2 2011/09/09 07:52:53 frostwork Exp $ |
| 90 |
|
| 91 |
-EAPI=4 |
| 92 |
+EAPI=6 |
| 93 |
|
| 94 |
-inherit cmake-utils eutils git-2 |
| 95 |
+inherit cmake-utils eutils git-r3 |
| 96 |
|
| 97 |
DESCRIPTION="M.A.R.S. a ridiculous shooter" |
| 98 |
HOMEPAGE="http://mars-game.sourceforge.net" |
| 99 |
@@ -15,13 +14,19 @@ SLOT="0" |
| 100 |
KEYWORDS="" |
| 101 |
IUSE="debug" |
| 102 |
|
| 103 |
-DEPEND="dev-libs/fribidi |
| 104 |
- >=media-libs/libsfml-2.0_rc20120731 |
| 105 |
+DEPEND=" |
| 106 |
+ dev-libs/fribidi |
| 107 |
+ media-libs/libsfml |
| 108 |
media-libs/taglib |
| 109 |
- virtual/opengl" |
| 110 |
+ virtual/opengl |
| 111 |
+" |
| 112 |
RDEPEND="${DEPEND}" |
| 113 |
|
| 114 |
+PATCHES=( |
| 115 |
+ "${FILESDIR}/${P}"-glib.patch |
| 116 |
+) |
| 117 |
+ |
| 118 |
src_prepare(){ |
| 119 |
- epatch "${FILESDIR}"/${P}-glib.patch |
| 120 |
sed -i -e "s:{CMAKE_INSTALL_PREFIX}/games:{CMAKE_INSTALL_PREFIX}/games/bin:g" -i src/CMakeLists.txt |
| 121 |
+ default |
| 122 |
} |
Archives