Merge branch 'master' of git.gentoo.org:proj/gamerlay

8 files changed, 126 insertions, 73 deletions

diff --git a/games-arcade/mars-game/Manifest b/games-arcade/mars-game/Manifest
index fec5208..0183aa3 100644
--- a/games-arcade/mars-game/Manifest
+++ b/games-arcade/mars-game/Manifest
@@ -1 +1 @@
-DIST mars-game-0.7.5.tar.gz 78421166 SHA256 283b406d7a365c1411ae13b03a0ffab630cf613cd0ffadef98244ed1589572b2 SHA512 395388456a20ba908c8e0c67708a8228a21313b2ec0cb9bb55b37f451ec31799549952eb480751da40a56b761db0dbb031a9644c7524979ac8cc2612009fab07 WHIRLPOOL 097d50d123ce85312dc1ddde21c3c384ba0e197e4921a2844bc12e0ff1ea2131db115c9a11cbc4fea17dce00cff9d0e0bea106437ebc0524bf8a6887188f2796
+DIST marsshooter-0.7.6.tar.gz 78563580 SHA256 1ff063590d71580baa432b8801987e79571d611e410d0302d5c376851d6e3378 SHA512 ec6fd95a9921c9c011005016a3d852a10504d8e5c601ed3fd0d896420b193958aeef7a5df0412f066a7db2423c09c12db748ef62bf6c95c0d3551c5bd9635c5a WHIRLPOOL fd96a290c4f97d344c4af83be116f8501d7fac3357e7779e39f2ceb97f8ae99d2c6478f675c155c658b2fc98995a5b6e1526db4c66bc70cba1bbb99c72dff86e
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/files/mars-game-9999-glib.patch b/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-0.7.5.ebuild b/games-arcade/mars-game/mars-game-0.7.5.ebuild
deleted file mode 100644
index 8384fee..0000000
--- a/games-arcade/mars-game/mars-game-0.7.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# 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/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
-	media-libs/taglib
-	virtual/opengl
-"
-RDEPEND="${DEPEND}"
-
-#S="${WORKDIR}/${PN}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-9999-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/mars-game-0.7.6.ebuild b/games-arcade/mars-game/mars-game-0.7.6.ebuild
new file mode 100644
index 0000000..bbbd032
--- /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; }
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>
diff --git a/metadata/layout.conf b/metadata/layout.conf
index dda1f01..47596e2 100644
--- a/metadata/layout.conf
+++ b/metadata/layout.conf
@@ -3,5 +3,5 @@ manifest-hashes = SHA256 SHA512 WHIRLPOOL
 update-changelog = false
 thin-manifests = true
 sign-commits = true
-sign-manifests = true
+sign-manifests = false
 cache-formats = md5-dict