stuntrally: bump

5 files changed, 35 insertions, 166 deletions

diff --git a/games-sports/stuntrally/Manifest b/games-sports/stuntrally/Manifest
index f841c19..e1dec34 100644
--- a/games-sports/stuntrally/Manifest
+++ b/games-sports/stuntrally/Manifest
@@ -1,15 +1 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-DIST StuntRally-1.9-sources.tar.xz 394374672 SHA256 dfd036c66ec9b7df4f5e3a7aa664dcc4860ebfaeedfb5c16eb6c999b4fa1715e SHA512 008871538eba089d17c9b10eec485751f180e2c488565887e04455a9fe7a4b6b010b9ea9c30d7183e15192a5cca9ea6b5f44c61857f358c94938678cbaab8245 WHIRLPOOL eef07267d42fdad0f835a1bfd15e96eda6ef0f088218c7b5b0e80df7ac311940ee0f42a8859653b6e68d142c72798fd4313c1e2623e0753d49eb10a1130e63e1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBCAAGBQJRdPZMAAoJECo/aRed9267zf0H+gMYWqPn8Wdtu6F3D56VDEzI
-Hg4ablFJ5S3nDgEE2iWFWg119V/BUZr5bPQhq87G11BtsH7RhetA4J27i+hPLYwz
-4BLwqc6Zcg6jqT86kg3u+r7NRvVW6cGS417rEzcGBgB9d3/+bY9tJAUa9WFfnZO3
-UPKe3CqIfZY31KNhYXAuCkmIv6boulzDqg/7Ymx6a6Ghuq+izNw/DgfNdUj7X8ZO
-6tk/o2SecTsqccCh/xSWbfwC9fodGCWJ1pYTfe5xfb3G0P9iW0WoaqOrE36V9EvT
-7VQxcXb13KIehiYTF2O8LR2RAhJfkzqfzyxhVddoNw6pYKgqFerNLu4ey9ANkos=
-=i5fZ
------END PGP SIGNATURE-----
+DIST stuntrally-2.6.tgz 651577187 SHA256 8cc309d27d26f78dcc596440547d68b5e41d02ef830df2d52d38611d45ebbaca SHA512 0fcc2fb69db1bb6909b049c0fca224a423bee4babfdfbb49a7a9aed624769a9a52fd900eba7dc2f5d6c25be14a7f7e920571fb6051ba670129d097547bce8fc0 WHIRLPOOL a40e7730b61feb026cb51954082320f9f307cd3d4ebfc180e81ad0ebe5ffa2890542838baa2f404c26b2e843fa01f2793a23c9791441aa93792a82d29274a5d0
diff --git a/games-sports/stuntrally/files/stuntrally-1.9-sharedir-absolute-path.patch b/games-sports/stuntrally/files/stuntrally-1.9-sharedir-absolute-path.patch
deleted file mode 100644
index 27ebe87..0000000
--- a/games-sports/stuntrally/files/stuntrally-1.9-sharedir-absolute-path.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Draft version of patch, that makes possible to define SHARED_DATA_DIR as
-absolute path.
-
-Notes: possibly breaks loading of data from user's home folder
-
---- source/vdrift/pathmanager.cpp.orig	2013-04-22 14:44:09.626544667 +0400
-+++ source/vdrift/pathmanager.cpp	2013-04-22 14:45:01.010546299 +0400
-@@ -176,7 +176,7 @@
- 		//dirs.push_back(user_data_dir);
- 
- 		// Adding relative path from installed executable
--		dirs.push_back(execname().parent_path().parent_path() / shareDir);
-+		dirs.push_back(shareDir);
- 		// Adding relative path for running from sources
- 		dirs.push_back(execname().parent_path().parent_path() / "data");
- 		dirs.push_back(execname().parent_path().parent_path());
diff --git a/games-sports/stuntrally/stuntrally-1.9-r1.ebuild b/games-sports/stuntrally/stuntrally-1.9-r1.ebuild
deleted file mode 100644
index 28c5743..0000000
--- a/games-sports/stuntrally/stuntrally-1.9-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-MY_P="StuntRally-${PV}-sources"
-
-inherit cmake-utils eutils games
-
-DESCRIPTION="Rally game focused on closed rally tracks with possible stunt elements (jumps, loops, pipes)."
-HOMEPAGE="http://code.google.com/p/vdrift-ogre/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="dedicated +game editor"
-
-S="${WORKDIR}/${MY_P}"
-
-# TODO:
-# - check for bundled dependencies(for e.g. libbullet)
-# - verify dependencies in RDEPEND(libXcursor is already confirmed)
-# - possibly add one more string to REQUIRED_USE to avoid unneeded building with USE="-*"
-RDEPEND="game? (
-		dev-games/ogre[cg,boost,ois,freeimage,opengl,zip]
-		dev-games/mygui
-		media-libs/libsdl:0
-		media-libs/libvorbis
-		media-libs/libogg
-		x11-libs/libXcursor
-	)
-	dev-libs/boost
-	net-libs/enet:1.3
-	virtual/libstdc++"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="editor? ( game )"
-
-DOCS=( Readme.txt )
-PATCHES=( "${FILESDIR}/${P}-sharedir-absolute-path.patch" )
-
-src_prepare() {
-	sed -i -e '/^Categories/s/Application;//' dist/*.desktop || die "sed on desktop files failed"
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSHARE_INSTALL="${GAMES_DATADIR}/${PN}"
-		$(cmake-utils_use_build dedicated MASTER_SERVER)
-		$(cmake-utils_use_build game GAME)
-		$(cmake-utils_use_build editor EDITOR)
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r data/*
-
-	rm config/CMakeLists.txt || die
-	doins -r config
-
-	dodoc ${DOCS[@]}
-	if use dedicated; then
-		pushd "${CMAKE_BUILD_DIR}" &>/dev/null || die
-		dogamesbin sr-masterserver
-		popd &>/dev/null
-	fi
-	if use editor; then
-		pushd "${CMAKE_BUILD_DIR}" &>/dev/null || die
-		dogamesbin sr-editor
-		popd &>/dev/null
-		domenu dist/sr-editor.desktop
-		doicon -s 64 dist/sr-editor.png
-	fi
-	if use game; then
-		pushd "${CMAKE_BUILD_DIR}" &>/dev/null || die
-		dogamesbin ${PN}
-		popd &>/dev/null
-		domenu dist/${PN}.desktop
-		doicon -s 64 dist/${PN}.png
-	fi
-
-	prepgamesdirs
-}
diff --git a/games-sports/stuntrally/stuntrally-1.9.ebuild b/games-sports/stuntrally/stuntrally-2.6.ebuild
index 86ed7e0..70ac400 100644
--- a/games-sports/stuntrally/stuntrally-1.9.ebuild
+++ b/games-sports/stuntrally/stuntrally-2.6.ebuild
@@ -2,56 +2,56 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="5"
+EAPI="6"
 
-[[ ${PV} = 9999* ]] && GIT="git-2"
+[[ ${PV} = 9999* ]] && GIT="git-r3"
 
-inherit games cmake-utils ${GIT}
+inherit cmake-utils ${GIT}
 
 DESCRIPTION="Rally game focused on closed rally tracks with possible stunt elements (jumps, loops, pipes)."
-HOMEPAGE="http://code.google.com/p/vdrift-ogre/"
+HOMEPAGE="http://stuntrally.tuxfamily.org/"
 
 SLOT="0"
 LICENSE="GPL-3"
-IUSE="dedicated +game editor"
+IUSE="dedicated +game editor static-libs"
 
 if [[ ${PV} = 9999* ]]; then
-        SRC_URI=""
-        KEYWORDS=""
+	SRC_URI=""
+	KEYWORDS=""
 	EGIT_REPO_URI="https://github.com/stuntrally/stuntrally"
 	LIVE_PDEPEND="=${CATEGORY}/${PN}-tracks-${PV}"
 else
-	MY_P="StuntRally-${PV}-sources"
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tgz"
 fi
 
 RDEPEND="
 	game? (
 		dev-games/ogre[cg,boost,ois,freeimage,opengl,zip]
-		dev-games/mygui
-		media-libs/libsdl:0
+		dev-games/mygui[ogre]
+		media-libs/libsdl2
 		media-libs/libvorbis
 		media-libs/libogg
+		media-libs/openal
+		sci-physics/bullet[bullet3,extras]
 	)
 	dev-libs/boost
 	net-libs/enet:1.3
 	virtual/libstdc++
-	sys-devel/gcc
 "
 DEPEND="${RDEPEND}"
 PDEPEND="${LIVE_PDEPEND}"
 
 REQUIRED_USE="editor? ( game )"
 
-DOCS=( Readme.txt )
+DOCS=(Readme.txt)
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_build dedicated MASTER_SERVER)
-		$(cmake-utils_use_build game GAME)
-		$(cmake-utils_use_build editor EDITOR)
+		-DBUILD_MASTER_SERVER=$(usex dedicated ON OFF)
+		-DBUILD_GAME=$(usex game ON OFF)
+		-DBUILD_EDITOR=$(usex editor ON OFF)
+		-DBUILD_SHARED_LIBS=$(usex !static-libs ON OFF)
 	)
 	cmake-utils_src_configure
 }
@@ -59,5 +59,4 @@ src_configure() {
 
 src_install() {
 	cmake-utils_src_install
-	prepgamesdirs
 }
diff --git a/games-sports/stuntrally/stuntrally-9999.ebuild b/games-sports/stuntrally/stuntrally-9999.ebuild
index 86ed7e0..398a19e 100644
--- a/games-sports/stuntrally/stuntrally-9999.ebuild
+++ b/games-sports/stuntrally/stuntrally-9999.ebuild
@@ -2,62 +2,56 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="5"
+EAPI="6"
 
-[[ ${PV} = 9999* ]] && GIT="git-2"
+[[ ${PV} = 9999* ]] && GIT="git-r3"
 
-inherit games cmake-utils ${GIT}
+inherit ${GIT} cmake-utils
 
 DESCRIPTION="Rally game focused on closed rally tracks with possible stunt elements (jumps, loops, pipes)."
-HOMEPAGE="http://code.google.com/p/vdrift-ogre/"
+HOMEPAGE="http://stuntrally.tuxfamily.org/"
 
 SLOT="0"
 LICENSE="GPL-3"
-IUSE="dedicated +game editor"
+IUSE="dedicated +game editor static-libs"
 
 if [[ ${PV} = 9999* ]]; then
-        SRC_URI=""
-        KEYWORDS=""
+	SRC_URI=""
+	KEYWORDS=""
 	EGIT_REPO_URI="https://github.com/stuntrally/stuntrally"
 	LIVE_PDEPEND="=${CATEGORY}/${PN}-tracks-${PV}"
 else
-	MY_P="StuntRally-${PV}-sources"
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tgz"
 fi
 
 RDEPEND="
 	game? (
 		dev-games/ogre[cg,boost,ois,freeimage,opengl,zip]
-		dev-games/mygui
-		media-libs/libsdl:0
+		dev-games/mygui[ogre]
+		media-libs/libsdl2
 		media-libs/libvorbis
 		media-libs/libogg
+		media-libs/openal
+		sci-physics/bullet[bullet3,extras]
 	)
 	dev-libs/boost
 	net-libs/enet:1.3
 	virtual/libstdc++
-	sys-devel/gcc
 "
 DEPEND="${RDEPEND}"
 PDEPEND="${LIVE_PDEPEND}"
 
 REQUIRED_USE="editor? ( game )"
 
-DOCS=( Readme.txt )
+DOCS=(Readme.txt)
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_build dedicated MASTER_SERVER)
-		$(cmake-utils_use_build game GAME)
-		$(cmake-utils_use_build editor EDITOR)
+		-DBUILD_MASTER_SERVER=$(usex dedicated ON OFF)
+		-DBUILD_GAME=$(usex game ON OFF)
+		-DBUILD_EDITOR=$(usex editor ON OFF)
+		-DBUILD_SHARED_LIBS=$(usex !static-libs ON OFF)
 	)
 	cmake-utils_src_configure
 }
-
-
-src_install() {
-	cmake-utils_src_install
-	prepgamesdirs
-}