[gentoo-commits] dev/vincent:master commit in: games-emulation/pcsx2/

["Vicente Olivert Riera" <vincent@gentoo.org>]

commit:     bf8f08a38b36ba84c4bccad39701448c35c6467a
Author:     Vicente Olivert Riera <vincent <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  5 18:36:38 2013 +0000
Commit:     Vicente Olivert Riera <vincent <AT> gentoo <DOT> org>
CommitDate: Tue Mar  5 18:36:38 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/vincent.git;a=commit;h=bf8f08a3

pcsx2-1.0.0.ebuild improvement

---
 games-emulation/pcsx2/Manifest           |    2 +-
 games-emulation/pcsx2/pcsx2-1.0.0.ebuild |   37 +++++++++++++++--------------
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index d16c41c..81ebbf6 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,3 +1,3 @@
 DIST pcsx2-1.0.0-r5350-sources.7z 10673799 SHA256 3f6067c3ea23b2afa4d4c411f3121d86612c310b1c7a44413577cf5727e498bc SHA512 6f765596c1d46b6a409711d085c4b5f8163a86508af59ce12088dae11bb8891188b4651eff7d07eb8feb9e5fd0b8c1d0681ea9b69c333a4c2a9fa7777e962661 WHIRLPOOL 7738216c67d71a4e21b34c75013e0e0e4c63def1e51083ea462658f5b73fbd3f4e76053c49ad86a33aa08c55a1317dcc389f4a46955622b180cf97385e954eca
-EBUILD pcsx2-1.0.0.ebuild 1994 SHA256 766b8f4c2d5e72c46d5cc968df868ba28026ef393612eed5501555bed9c4658f SHA512 1a8e5006b33a951b134044e883feb30dfc2dc95aa860612011da8ef13585b34144468b2d914435ac91925a706585ec0b9a64e969b3ec229d62c76a3fa0a338e9 WHIRLPOOL 024a85148e385ce63ad06eb5a2e73de7a60fcb04e95a33869f62f4226fd25ba7f3e02b3e552f2a580ec2daa286ab0641f562fdfcdeb8a5795889fcbf58b6d14a
+EBUILD pcsx2-1.0.0.ebuild 2036 SHA256 460a1dbe06034646ffaa635960ab4516fd8bd39167e77bf89dc5f58d5c9ca04f SHA512 bec07fb7b342ecbab966012eb2dc00f6d82c37f9b5becdf5c79ee14c16a70220393d8a673b6f916b327bfcc1e6c27d39611cac943c8e0b86064dd8b2c1492931 WHIRLPOOL 523bc00f59344573e2538375bf76629dd3ebe545065976edd4b1396f0402273cefd9e84431d6e40e57ec5f5528caf6003cf3c79b0c2223dfc59564c9e3fc9614
 MISC metadata.xml 346 SHA256 ec3a634eed6c4f90c68925dc7127c2e706fc9f02013321918e72c0368f488bb9 SHA512 837626e9e6f66b309f65999684b459921c9e6294fbd47448046fcdec27d988a3bb941d2685d9fc0399bddc8ea78b6957aae56158941ed4425c507c3d22a20720 WHIRLPOOL 536fb2fca6cfe9d8a0e470f27d50efa043c4fa27586eff61d7fc3facf265623e4b03b8bde03ff1d04d302e292dfc77278deb6b418df7ee44dc37b3ef9bda8f39

diff --git a/games-emulation/pcsx2/pcsx2-1.0.0.ebuild b/games-emulation/pcsx2/pcsx2-1.0.0.ebuild
index 4998431..8595c64 100644
--- a/games-emulation/pcsx2/pcsx2-1.0.0.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.0.0.ebuild
@@ -15,13 +15,11 @@ SRC_URI="http://dev.gentoo.org/~vincent/${MY_P}.7z"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-IUSE="debug multilib"
 
 S="${WORKDIR}/${MY_P}"
 
-DEPEND="app-arch/bzip2
+DEPEND="app-arch/p7zip
 	dev-cpp/sparsehash
-	media-gfx/nvidia-cg-toolkit[multilib?]
 	media-libs/alsa-lib
 	media-libs/glew
 	media-libs/libsdl
@@ -35,7 +33,8 @@ DEPEND="app-arch/bzip2
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/wxGTK:2.8[X]
-	multilib? (
+	x86? ( media-gfx/nvidia-cg-toolkit )
+	amd64? (
 		app-emulation/emul-linux-x86-baselibs
 		app-emulation/emul-linux-x86-opengl
 		app-emulation/emul-linux-x86-xlibs
@@ -44,32 +43,29 @@ DEPEND="app-arch/bzip2
 		app-emulation/emul-linux-x86-soundlibs
 		app-emulation/emul-linux-x86-libsoundtouch
 		app-emulation/emul-linux-x86-wxGTK:2.8
+		media-gfx/nvidia-cg-toolkit[multilib]
 	)"
 RDEPEND="${DEPEND}"
 
-use amd64 && ABI="x86"
-
-if use debug ; then
-	CMAKE_BUILD_TYPE="Debug"
-else
-	CMAKE_BUILD_TYPE="Release"
-fi
-
 src_prepare() {
 	sed -i -e "s:GSdx TRUE:GSdx FALSE:g" -i cmake/SelectPcsx2Plugins.cmake || die "sed failed"
 	sed -e "s:0.9.8:${PV}:g" -i CMakeLists.txt || die "sed failed"
 }
 
 src_configure() {
-	wxgtk_config=""
-	cg_config=""
+	use amd64 && local ABI="x86"
+
+	local wxgtk_config=""
+	local cg_config=""
+	local mylibpath=""
+
 	if use amd64 ; then
-		mylibpath="/usr/lib32"
+		mylibpath="/usr/$(get_libdir)"
 		wxgtk_config="-DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-2.8-32"
 		cg_config="-DCG_LIBRARY=/opt/nvidia-cg-toolkit/lib32/libCg.so
 			-DCG_GL_LIBRARY=/opt/nvidia-cg-toolkit/lib32/libCgGL.so"
 	else
-		mylibpath="/usr/lib"
+		mylibpath="/usr/$(get_libdir)"
 	fi
 
 	mycmakeargs="-DPACKAGE_MODE=1
@@ -81,10 +77,15 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
+src_compile() {
+	cmake-utils_src_compile
+}
+
 src_install() {
-	cmake-utils_src_install DESTDIR="${D}"
+	cmake-utils_src_install
 
-	for i in "${D}"/usr/bin/*; do dogamesbin $i; rm $i; done
+	local exe
+	for exe in "${D}"/usr/bin/*; do dogamesbin "${exe}"; rm "${exe}"; done
 
 	prepgamesdirs
 }