From c7645e51f77474ae9b8220162f44611f7ac4ddf4 Mon Sep 17 00:00:00 2001
From: Fabian Fingerle <fabian@datensalat.eu>
Date: Fri, 30 Oct 2009 22:20:44 +0100
Subject: [PATCH] games-arcade/performous-9999: update

---
 games-arcade/performous/Manifest               |  2 +-
 games-arcade/performous/performous-9999.ebuild | 83 ++++++++++----------------
 2 files changed, 31 insertions(+), 54 deletions(-)

diff --git a/games-arcade/performous/Manifest b/games-arcade/performous/Manifest
index d4f97b1..95ce647 100644
--- a/games-arcade/performous/Manifest
+++ b/games-arcade/performous/Manifest
@@ -7,6 +7,6 @@ DIST ultrastar-songs-restricted-3.zip 10242651 RMD160 7eb59b4db7968097db8f850f47
 DIST ultrastar-songs-shearer-1.zip 50411551 RMD160 20ea920aa05c489903988bf31edff467012d4921 SHA1 49d64f914cfd77cc39dcaa14b00a5b4c5df3f112 SHA256 967c3dfae2da2915a66fd9dfee14da7191e13bb95e8b0820049d109c21f25628
 EBUILD performous-0.3.0.ebuild 2532 RMD160 52a79bb0e1c8165c75d4cdb42e955e27629fcca7 SHA1 e5c1c6d8646667aa547262ccfc2d055924846c61 SHA256 1e082ac56aca67722b7b5f7f81c01768c95e9599cd231e72f3789ba53f909ae0
 EBUILD performous-0.3.1.ebuild 3166 RMD160 71f9c36fcefde53c38f257699f2faf271ad2ff99 SHA1 3e540669ca2a801b6da60379995f9da51ec79481 SHA256 204b1b3ede91653b4651db97f709a456e215a8f4a3e210faf5a00a768a8a2ccc
-EBUILD performous-9999.ebuild 3023 RMD160 f51def84827afa0895d2ea26d5f4caccb922e71f SHA1 87d9087f2361dadd63777d2886f9911c85156062 SHA256 5bd8e8aa7e96542989279476c4ac48fd4460e0218dbf4e28d746d29e09d6e502
+EBUILD performous-9999.ebuild 2532 RMD160 a09551fed4b9e7c52eb298cfa735892f19d57407 SHA1 1ece2e281e1a67c7712f829962bc6b7fff129edf SHA256 6da096856c0642beea66729d9fb59ad07262c42a334a655af40012187eff4465
 MISC ChangeLog 546 RMD160 cbd139e2167cc6fc0e1d951a8539a7ce3c042a64 SHA1 972af871c500dcf98fe77a11836f01d8bdffb52f SHA256 62aedc11f4315d6e6569c448b6bee96444e4ba744dfee08de710eb5b36aa5b7c
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-arcade/performous/performous-9999.ebuild b/games-arcade/performous/performous-9999.ebuild
index 6b49636..4ff6dfa 100644
--- a/games-arcade/performous/performous-9999.ebuild
+++ b/games-arcade/performous/performous-9999.ebuild
@@ -2,7 +2,8 @@
 # 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 $
 
-inherit games git cmake-utils
+EAPI=2
+inherit git games cmake-utils
 
 RESTRICT="nostrip"
 
@@ -17,7 +18,7 @@ SRC_URI="songs? (
 	mirror://sourceforge/${PN}/${SONGS_PN}-shearer-1.zip
 	)"
 
-EGIT_REPO_URI="git://git.performous.org/gitroot/performous/performous"
+EGIT_REPO_URI="git://performous.git.sourceforge.net/gitroot/performous/performous"
 
 LICENSE="GPL-2
 	songs? (
@@ -27,13 +28,15 @@ LICENSE="GPL-2
 SLOT="0"
 KEYWORDS=""
 
-IUSE="debug alsa portaudio pulseaudio jack songs gstreamer"
+IUSE="debug alsa portaudio pulseaudio jack songs gstreamer tools editor"
 
 RDEPEND="gnome-base/librsvg
 	dev-libs/boost
 	x11-libs/pango
 	dev-cpp/libxmlpp
 	media-libs/glew
+	media-libs/libsdl[joystick,opengl]
+	media-gfx/imagemagick[png]
 	>=media-video/ffmpeg-0.4.9_p20070616-r20
 	alsa? ( media-libs/alsa-lib )
 	jack? ( media-sound/jack-audio-connection-kit )
@@ -45,13 +48,6 @@ RDEPEND="gnome-base/librsvg
 DEPEND="${RDEPEND}
     >=dev-util/cmake-2.6.0"
 
-pkg_setup() {
-	games_pkg_setup
-	if ! built_with_use --missing true dev-libs/boost threads ; then
-		eerror "Please emerge dev-libs/boost with USE=threads"
-	fi
-}
-
 src_unpack() {
 	git_src_unpack
 	if use songs; then
@@ -60,58 +56,39 @@ src_unpack() {
 		unpack "${SONGS_PN}-libre-3.zip"
 		unpack "${SONGS_PN}-restricted-3.zip"
 		unpack "${SONGS_PN}-shearer-1.zip"
-		pwd
 	fi
 }
 
+src_configure() {
+	local mycmakeargs="
+		$(cmake-utils_use alsa LIBDA_PLUGIN_ALSA)
+		$(cmake-utils_use jack LIBDA_PLUGIN_JACK)
+		$(cmake-utils_use gstreamer LIBDA_PLUGIN_GSTREAMER)
+		$(cmake-utils_use portaudio LIBDA_PLUGIN_PORTAUDIO)
+		$(cmake-utils_use pulseaudio LIBDA_PLUGIN_PULSEAUDIO)
+		$(cmake-utils_use_enable tools TOOLS)
+		$(cmake-utils_use_enable editor EDITOR)
+		-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}
+		-DSHARE_INSTALL=share/
+		-DLIBDA_AUTODETECT_PLUGINS=false
+		-DLIBDA_PLUGIN_TESTING=false
+		-DCMAKE_BUILD_TYPE=Release"
+
+	cmake-utils_src_configure
+}
+
 src_compile() {
-	mkdir build
-	cd build
-	plugins="-DLIBDA_AUTODETECT_PLUGINS=false -DLIBDA_PLUGIN_TESTING=false"
-	if use alsa ; then
-		plugins="$plugins -DLIBDA_PLUGIN_ALSA=true"
-	else
-		plugins="$plugins -DLIBDA_PLUGIN_ALSA=false"
-	fi
-	if use jack ; then
-		plugins="$plugins -DLIBDA_PLUGIN_JACK=true"
-	else
-		plugins="$plugins -DLIBDA_PLUGIN_JACK=false"
-	fi
-	if use gstreamer ; then
-		plugins="$plugins -DLIBDA_PLUGIN_GSTREAMER=true"
-	else
-		plugins="$plugins -DLIBDA_PLUGIN_GSTREAMER=false"
-	fi
-	if use portaudio ; then
-		plugins="$plugins -DLIBDA_PLUGIN_PORTAUDIO=true"
-	else
-		plugins="$plugins -DLIBDA_PLUGIN_PORTAUDIO=false"
-	fi
-	if use pulseaudio ; then
-		plugins="$plugins -DLIBDA_PLUGIN_PULSE=true"
-	else
-		plugins="$plugins -DLIBDA_PLUGIN_PULSE=false"
-	fi
-	cmake \
-		-DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
-		-DCMAKE_INSTALL_PREFIX="/usr" \
-		$plugins \
-		.. || die "cmake failed"
-	emake || die "emake failed"
+	cmake-utils_src_compile
 }
 
 src_install() {
-	cd build
-	emake DESTDIR="${D}" install || die "make install failed"
-	keepdir "/usr/ultrastar/songs"
-	rm -rf "${D}/usr/share/${PN}"/{applications,pixmaps}
+	DOCS="docs/*.txt" cmake-utils_src_install
+
 	if use songs; then
 		insinto "/usr/share/games/ultrastar"
-		doins -r ../songs || die "doins songs failed"
+		doins -r "${S}/songs" || die "doins songs failed"
 	fi
-	doicon data/${PN}.xpm
-	domenu data/${PN}.desktop
-	dodoc ../docs/*.txt
+	doicon "${S}/data/${PN}.xpm"
+	domenu "${S}/data/${PN}.desktop"
 	prepgamesdirs
 }
-- 
2.11.4.GIT