mars-game: fixes

4 files changed, 34 insertions, 41 deletions

diff --git a/games-arcade/mars-game/Manifest b/games-arcade/mars-game/Manifest
index 6c7eb14..fec5208 100644
--- a/games-arcade/mars-game/Manifest
+++ b/games-arcade/mars-game/Manifest
@@ -1,21 +1 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-DIST mars_source_0.7.5.tar.gz 86856256 SHA256 b3f4ceaa95b6c1be599bf05f8e24a331296fec4c45b931d1ad846f7887cd65b3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCAAGBQJQlghdAAoJECZQPTSbOzNL6YcP/RDqmuQk1bwms0i07hyhGtd3
-uGIS9dNZovM3ycPGHyIdn8QOgxFCg1ve6vrEfHabMOLCaJxK5i1MU0iXCjG4qamD
-jNEUe7kYkLrXORbXlxBp7HQqLutz7SgEdI7cb+T4dfMLAuqxdNM73A71IOZL3bla
-N8Q3peos53Zm5M2x8OWFe5MhaFr5jUQUYSy80+MeZfAL4fQME5bwmn0GgecRUT2V
-TeSrJA7DtWUgaZgL05TKon57ULXJemivFSa/Tgd3ersbCLm0zPbRMIlKNceTjhmv
-txZliH5fwzBsjpQw1TDfF1NGd8eyUgmMiz0owgc3t8B1toSxjM7rg72KhptAmuUv
-PKmSF1pZJDE4qrnC23tVfuWpc5sQPAu6UWbq+5fDwvaIuEq3PftAxm9r7JdwhYlQ
-O2+yZWGQn6Z8B3hW19Bcg4hhAijRHpjlqMvrFxy2+nlosw7WqUTyXwruV3Cmn9Or
-f4yAhh2jaDgvHhmzULCguY1TcJYAz/EBnRMgXkBDTyAQ5w4LIjJtEKNdpjvqC/FM
-6cshTiXbiGZL3rggMs3OW0zuzTh1qIs+Jm8MzXMJbC8kaYn8ypHpOF0yo8S3dsiP
-V/1QRTgFz4Sd7EmbF9cmYxtS6VrOwoEZJNIDKoK0Isdr0QDbrZsMXa0U6yKdO23h
-dgRl8ogjwCt/iDeGfgvB
-=nVRl
------END PGP SIGNATURE-----
+DIST mars-game-0.7.5.tar.gz 78421166 SHA256 283b406d7a365c1411ae13b03a0ffab630cf613cd0ffadef98244ed1589572b2 SHA512 395388456a20ba908c8e0c67708a8228a21313b2ec0cb9bb55b37f451ec31799549952eb480751da40a56b761db0dbb031a9644c7524979ac8cc2612009fab07 WHIRLPOOL 097d50d123ce85312dc1ddde21c3c384ba0e197e4921a2844bc12e0ff1ea2131db115c9a11cbc4fea17dce00cff9d0e0bea106437ebc0524bf8a6887188f2796
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
 }