[Performous-commit] Vincent Le Ligeour : Fixed some installation stuffs (see http://bugs.gentoo .org/show_bug.cgi?id=245452)

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

Module: performous
Branch: master
Commit: 7e7d2dceeb6ffe5aa6d8fb09b451c84752ce2bf7

Author: Vincent Le Ligeour <yo...@us...>
Date:   Wed Oct 14 15:33:08 2009 +0200

Fixed some installation stuffs (see http://bugs.gentoo.org/show_bug.cgi?id=245452)

---

 CMakeLists.txt                                     |    4 +++-
 .../games-arcade/performous/performous-9999.ebuild |   14 ++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dac5015..37833e6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,7 +20,9 @@ endif(NOT CMAKE_BUILD_TYPE)
 if(WIN32)
 	set(SHARE_INSTALL "." CACHE STRING "Data file install path. Must be a relative path (from CMAKE_INSTALL_PREFIX), with no trailing slash.")
 else(WIN32)
-	set(SHARE_INSTALL "share/games/performous" CACHE STRING "Data file install path. Must be a relative path (from CMAKE_INSTALL_PREFIX), with no trailing slash.")
+	if(NOT SHARE_INSTALL)
+		set(SHARE_INSTALL "share/games/performous" CACHE STRING "Data file install path. Must be a relative path (from CMAKE_INSTALL_PREFIX), with no trailing slash.")
+	endif(NOT SHARE_INSTALL)
 endif(WIN32)
 
 mark_as_advanced(SHARE_INSTALL)
diff --git a/portage-overlay/games-arcade/performous/performous-9999.ebuild b/portage-overlay/games-arcade/performous/performous-9999.ebuild
index 110650c..bd908b0 100644
--- a/portage-overlay/games-arcade/performous/performous-9999.ebuild
+++ b/portage-overlay/games-arcade/performous/performous-9999.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $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 games git cmake-utils
 
 RESTRICT="nostrip"
@@ -100,9 +101,14 @@ src_compile() {
 	else
 		plugins="$plugins -DLIBDA_PLUGIN_PULSE=false"
 	fi
+	if [[ $(get_libdir) = "lib64" ]]; then
+		libdir_suffix="64"
+	fi
 	cmake \
 		-DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
-		-DCMAKE_INSTALL_PREFIX="/usr" \
+		-DCMAKE_INSTALL_PREFIX="${GAMES_PREFIX}" \
+		-DLIB_SUFFIX="$libdir_suffix" \
+		-DSHARE_INSTALL="share/" \
 		$plugins \
 		.. || die "cmake failed"
 	emake || die "emake failed"
@@ -111,8 +117,12 @@ src_compile() {
 src_install() {
 	cd build
 	emake DESTDIR="${D}" install || die "make install failed"
+
+	perl -pi -e "s+bin/performous+bin/performous.bin+" "${D}/${GAMES_PREFIX}/bin/performous.sh"
+	mv "${D}/${GAMES_PREFIX}/bin/performous" "${D}/${GAMES_PREFIX}/bin/performous.bin"
+	mv "${D}/${GAMES_PREFIX}/bin/performous.sh" "${D}/${GAMES_PREFIX}/bin/performous"
+
 	keepdir "/usr/ultrastar/songs"
-	rm -rf "${D}/usr/share/${PN}"/{applications,pixmaps}
 	if use songs; then
 		insinto "/usr/share/games/ultrastar"
 		doins -r ../songs || die "doins songs failed"