5 files changed, 91 insertions, 7 deletions
diff --git a/games-fps/gzdoom/ChangeLog b/games-fps/gzdoom/ChangeLog
index fd4daeb10..7cf8faadb 100644
--- a/games-fps/gzdoom/ChangeLog
+++ b/games-fps/gzdoom/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  29 Aug 2010; Mike MacDonald (crazymykl) <crazymykl@gmail.com>
+  +gzdoom-1.5.2.ebuild, gzdoom-9999.ebuild:
+  gzdoom version bump, add fluidsynth support (w/ useflag)
+
   23 Aug 2010; Mike MacDonald (crazymykl) <crazymykl@gmail.com>
   +gzdoom-1.5.0.ebuild:
   gzdoom version bump
diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index 7b36d5e64..6377e5a2b 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,7 +1,9 @@
 DIST gzdoom-1.4.8.tar.bz2 3416057 RMD160 0faa93b5a2fea5f1559644ce4edfda695818dc16 SHA1 acdafb686961f0b1099dbbd7addcb312303e88a8 SHA256 ddac1b53acd8c6086ddb5ccad549d1ab817ca2f566748b19b53e22b1a1d551f9
 DIST gzdoom-1.5.0.tar.bz2 3633413 RMD160 03babcea48b7691601beb24f907f281054ee044f SHA1 776bd1b5e9ee1e2e750aa60dfd2a6a4a63ab5f4a SHA256 e543bfad3d5d98bf22490ce09e6c465b9963989853a6d5fd7c5749d4c01b9cc7
+DIST gzdoom-1.5.2.tar.bz2 3680980 RMD160 429d02a9b4bfcbb8329cc2e8cc32fb8122c83f0f SHA1 895f39817a4af121b0e58a220ec4c9b648eaf8be SHA256 5d441289a220f68e316ffd509bf10d7c6deb06e0532a108645ee794cc1485af2
 EBUILD gzdoom-1.4.8.ebuild 1409 RMD160 5188839d05f83167ce08e8ac8ad95765f0508781 SHA1 873961a0b4f1925137037661e31d764f6c4ccea3 SHA256 3b9400c374cdc162184d2a6152dec1f185281319f2ada12d67db86d1228cf5ff
 EBUILD gzdoom-1.5.0.ebuild 1409 RMD160 49e62eb3ebca5a26937ecddaaee1827ef008d0ab SHA1 22d95d0baeacb0d60f1f063cb3fc7cc22bcdca80 SHA256 4363b9df9873ff6cb7068f8db5c9ad241e5a2aa73f6b1a513d74716cabfb8460
-EBUILD gzdoom-9999.ebuild 1507 RMD160 1faa6387968539823451c41e16ce9a6176356dab SHA1 68fb9278e50ac37f647c293a2a12e52e60d5e9ed SHA256 6eb57eeab4c51dde5450ef071a18fada8cc7cb142861a662a9c2ca9186d38a49
-MISC ChangeLog 428 RMD160 b16a62e7534114173634a0e7b80fc0befd8020a0 SHA1 7cca8dbe3fb7796e4ee963512d0e3e12a33cdd60 SHA256 5d5e15373d00cdfa63a1ac79d30bf880eb3af9078fccbeee70c9f0ea322cf383
-MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f
+EBUILD gzdoom-1.5.2.ebuild 1571 RMD160 292012791a336fcd97d6e75f477ad01cc539c6d0 SHA1 859c919f87a6dd25dd83af267e7268f395b459df SHA256 ddb0f5a75371cbcca83f56d8f848c1019b2c23094799d9b10e259390b6202c80
+EBUILD gzdoom-9999.ebuild 1672 RMD160 8266fc6f7d03cf0360fa8c2a21d425083f234505 SHA1 9b33c0e39153904b542bb5b19a1c6492229ce8cb SHA256 65ab3ee711ec634f839a7b7587107187e6aaeaf13415e70aa0b9cc4a40712f2a
+MISC ChangeLog 596 RMD160 a89098fb108bac6e98b7c6db75bca87e2e9bca3a SHA1 6ef6d771d24c19d4d49698b129fde0ff7c66322d SHA256 c7a9507c6a6e700a01fd5e44bb1841fbdbe8304602aca2f292e710f3066382c4
+MISC metadata.xml 314 RMD160 b5fdfa7bd0d9f6ac4099a7ab1e5ecc0dc38b4f80 SHA1 cc7a61959fc27a463dfcb5dc00dbb2add2fd2d9f SHA256 969cf7d5c38ba9ebf828e362d9290960d355ccabf340b0bf2c489610eb8a874c
diff --git a/games-fps/gzdoom/gzdoom-1.5.2.ebuild b/games-fps/gzdoom/gzdoom-1.5.2.ebuild
new file mode 100644
index 000000000..f043f32c0
--- /dev/null
+++ b/games-fps/gzdoom/gzdoom-1.5.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit games cmake-utils
+
+DESCRIPTION="Enhanced OpenGL port of the official DOOM source code that also supports Heretic, Hexen, and Strife"
+HOMEPAGE="http://grafzahl.drdteam.org/"
+SRC_URI="http://omploader.org/vNWRqMQ/${P}.tar.bz2"
+
+LICENSE="DOOMLIC BUILDLIC BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="mmx gtk fluidsynth"
+
+RDEPEND="gtk? ( x11-libs/gtk+:2 )
+	fluidsynth? ( media-sound/fluidsynth )
+	media-libs/flac
+	media-libs/fmod:1
+	media-libs/jpeg
+	media-libs/libsdl"
+
+DEPEND="${REPEND}
+	mmx? ( || ( dev-lang/nasm dev-lang/yasm ) )"
+
+src_prepare() {
+	# Use default game data path"
+	sed -i \
+		-e "s:/usr/local/share/:${GAMES_DATADIR}/doom-data/:" \
+		src/sdl/i_system.h || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_no mmx ASM)
+		$(cmake-utils_use_no gtk GTK)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	dodoc docs/*.{txt,TXT} || die
+	dohtml docs/console*.{css,html} || die
+
+	cd "${CMAKE_BUILD_DIR}" || die
+	dogamesbin ${PN} || die
+
+	insinto "${GAMES_DATADIR}/doom-data"
+	doins ${PN}.pk3 || die
+
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+
+	elog "Copy or link wad files into ${GAMES_DATADIR}/doom-data/"
+	elog "(the files must be readable by the 'games' group)."
+	elog
+	elog "To play, simply run:"
+	elog "   gzdoom"
+	elog
+	if use fluidsynth; then
+		ewarn "You may need to install a SoundFont to use fluidsynth for music."
+		elog
+	fi
+	elog "See /usr/share/doc/${P}/zdoom.txt.bz2 for more info"
+}
diff --git a/games-fps/gzdoom/gzdoom-9999.ebuild b/games-fps/gzdoom/gzdoom-9999.ebuild
index a03a54e84..626d8fdd8 100644
--- a/games-fps/gzdoom/gzdoom-9999.ebuild
+++ b/games-fps/gzdoom/gzdoom-9999.ebuild
@@ -13,15 +13,17 @@ ESVN_REPO_URI="http://mancubus.net/svn/hosted/gzdoom/trunk/"
 LICENSE="DOOMLIC BUILDLIC BSD"
 SLOT="0"
 KEYWORDS=""
-IUSE="mmx gtk"
+IUSE="mmx gtk fluidsynth"
 
-RDEPEND="gtk? ( x11-libs/gtk+:2 )
+RDEPEND="
+	fluidsynth? ( media-sound/fluidsynth )
+	gtk? ( x11-libs/gtk+:2 )
 	media-libs/flac
 	media-libs/fmod:1
 	media-libs/jpeg
 	media-libs/libsdl"
 
-DEPEND="${REPEND}
+DEPEND="${RDEPEND}
 	mmx? ( || ( dev-lang/nasm dev-lang/yasm ) )"
 
 src_prepare() {
@@ -35,7 +37,7 @@ src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_no mmx ASM)
 		$(cmake-utils_use_no gtk GTK)
-		-DFOMD_INCLUDE_DIR=/opt/fmodex/api/inc/
+		-DFMOD_INCLUDE_DIR=/opt/fmodex/api/inc/
 		-DFMOD_LIBRARY=/opt/fmodex/api/lib/libfmodex.so
 	)
 
@@ -64,5 +66,9 @@ pkg_postinst() {
 	elog "To play, simply run:"
 	elog "   gzdoom"
 	elog
+	if use fluidsynth; then
+		ewarn "You may need to install a SoundFont to use fluidsynth for music."
+		elog
+	fi
 	elog "See /usr/share/doc/${P}/zdoom.txt.* for more info"
 }
diff --git a/games-fps/gzdoom/metadata.xml b/games-fps/gzdoom/metadata.xml
index e6233b5dc..f1140043a 100644
--- a/games-fps/gzdoom/metadata.xml
+++ b/games-fps/gzdoom/metadata.xml
@@ -3,4 +3,5 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer><email>maintainer-wanted@gentoo.org</email></maintainer>
+<use><flag name='fluidsynth'>Enables Fluidsynth MIDI software synthesis</flag></use>
 </pkgmetadata>