[Performous-commit] Vincent Le Ligeour : Updated gentoo ebuild and removed debug message

[Yoda-JM <yo...@us...>]

Module: performous
Branch: master
Commit: 70b1fc4dcbe17bc6839bef8a84eb3fef6fcf700a

Author: Vincent Le Ligeour <yo...@us...>
Date:   Sat Apr  3 11:16:40 2010 +0200

Updated gentoo ebuild and removed debug message

---

 game/fs.cc                                         |    1 -
 .../games-arcade/performous/performous-9999.ebuild |   26 ++++++++++++++++---
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/game/fs.cc b/game/fs.cc
index 7d1bf96..32163d0 100644
--- a/game/fs.cc
+++ b/game/fs.cc
@@ -30,7 +30,6 @@ fs::path getLocaleDir() {
 		dir = LOCALEDIR;
 	} else {
 		dir = plugin::execname().parent_path().parent_path() / LOCALEDIR;
-		std::cout << "REL: " << dir << std::endl;
 	}
 
 	return dir;
diff --git a/portage-overlay/games-arcade/performous/performous-9999.ebuild b/portage-overlay/games-arcade/performous/performous-9999.ebuild
index e1f28cf..8337767 100644
--- a/portage-overlay/games-arcade/performous/performous-9999.ebuild
+++ b/portage-overlay/games-arcade/performous/performous-9999.ebuild
@@ -3,13 +3,15 @@
 # $Header: /cvsroot/ultrastar-ng/UltraStar-ng/portage-overlay/games-arcade/performous/performous-9999.ebuild,v 1.10 2007/09/29 13:04:19 yoda-jm Exp $
 
 EAPI=2
-inherit git games cmake-utils
+
+inherit games cmake-utils
+[ "$PV" == "9999" ] && inherit git
 
 RESTRICT="nostrip"
 
 SONGS_PN=ultrastar-songs
 
-DESCRIPTION="Karaoke game similar to Singstar"
+DESCRIPTION="Party game similar to Singstar, RockBand, Guitar Hero and Stepmania"
 HOMEPAGE="http://performous.org"
 SRC_URI="songs? ( 
 	mirror://sourceforge/${PN}/${SONGS_PN}-jc-1.zip
@@ -18,7 +20,12 @@ SRC_URI="songs? (
 	mirror://sourceforge/${PN}/${SONGS_PN}-shearer-1.zip
 	)"
 
-EGIT_REPO_URI="git://performous.git.sourceforge.net/gitroot/performous/performous"
+if [ "$PV" != "9999" ]; then
+	SRC_URI=" mirror://sourceforge/${PN}/${MY_P}.tar.bz2
+		$SRC_URI"
+else
+	EGIT_REPO_URI="git://performous.git.sourceforge.net/gitroot/performous/performous"
+fi
 
 LICENSE="GPL-2
 	songs? (
@@ -51,14 +58,22 @@ RDEPEND="gnome-base/librsvg
 DEPEND="${RDEPEND}
     >=dev-util/cmake-2.6.0"
 
+S="${WORKDIR}/${MY_P}"
+
 src_unpack() {
-	git_src_unpack
+	if [ "${PV}" != "9999" ]; then
+		unpack "${MY_P}.tar.bz2"
+	else
+		git_src_unpack
+		cd "${S}"
+	fi
 	if use songs; then
 		cd "${S}"
 		unpack "${SONGS_PN}-jc-1.zip"
 		unpack "${SONGS_PN}-libre-3.zip"
 		unpack "${SONGS_PN}-restricted-3.zip"
 		unpack "${SONGS_PN}-shearer-1.zip"
+		cd "${S}"
 	fi
 }
 
@@ -73,6 +88,7 @@ src_configure() {
 		$(cmake-utils_use_enable editor EDITOR)
 		-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}
 		-DSHARE_INSTALL=share/performous
+		-DLOCALE_DIR=/usr/share
 		-DLIBDA_AUTODETECT_PLUGINS=false
 		-DLIBDA_PLUGIN_TESTING=false
 		-DCMAKE_BUILD_TYPE=Release"
@@ -87,6 +103,8 @@ src_compile() {
 src_install() {
 	DOCS="docs/*.txt" cmake-utils_src_install
 
+	mv "${D}/${GAMES_PREFIX}/share/locale" "${D}/usr/share/"
+
 	if use songs; then
 		insinto "/usr/share/games/ultrastar"
 		doins -r "${S}/songs" || die "doins songs failed"