games-fps/gzdoom: Fix live-ebuild compilation

svn path=/sunrise/; revision=12767

4 files changed, 24 insertions, 39 deletions

diff --git a/games-fps/gzdoom/ChangeLog b/games-fps/gzdoom/ChangeLog
index 34353cb5a..15e180efc 100644
--- a/games-fps/gzdoom/ChangeLog
+++ b/games-fps/gzdoom/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for games-fps/gzdoom
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  21 Feb 2012; Mike MacDonald (crazymykl) <crazymykl@gmail.com>
+  gzdoom-9999.ebuild, +files/gzdoom-respect-fluidsynth-useflag.patch.old,
+  files/gzdoom-respect-fluidsynth-useflag.patch:
+  Fix live-ebuild compilation
+
   16 Dec 2011; Mike MacDonald (crazymykl) <crazymykl@gmail.com>
   gzdoom-1.5.5.ebuild, +files/gzdoom-1.5.5-fix-new-fmod.patch,
   gzdoom-9999.ebuild, +files/gzdoom-9999-fix-new-fmod.patch:
diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index ac9ca8a63..587acdf00 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,8 +1,8 @@
 AUX gzdoom-1.5.5-fix-new-fmod.patch 4755 RMD160 1c134cc67a76b4429de9fd4af5787fb4680ffb37 SHA1 b681ccab370c3e60f3e8ac31629bfd87c85b6c1f SHA256 3f5934cc3841fd21a00a27d3c4ff5dfd8edf5b44aa981c00c6969138d47aa0b7
 AUX gzdoom-9999-fix-new-fmod.patch 4019 RMD160 3f3e43edff91dbb506ae10ac06d203dfd1ea8b93 SHA1 3091ac26e43d07827d8dc1e86e2ca6bfac151bb2 SHA256 b50b933ff655f2fdbb23ee8c905307c0783eddbd499d0963d204c97143603a4b
-AUX gzdoom-respect-fluidsynth-useflag.patch 1543 RMD160 b104bca99792102fbfd4b67bbd35dc5a876c6f4b SHA1 da5bea93a8542672687c37f1fa4b3f7d39d7846b SHA256 d8ac175c57bd673e0fe1ea7c9b592c74f27b0457cfcc84cb711c819528a3469c
+AUX gzdoom-respect-fluidsynth-useflag.patch 582 RMD160 27d0aea80743f2d3927feece4e548ef2ca45f643 SHA1 e54d25efcbb92729e7464d931f27aaefeca99e53 SHA256 67d1638278fd83c7a5a6b679c5c57342440c1f053825ede3c71b796c6259de4b
 DIST gzdoom-1.5.5.tar.bz2 3679401 RMD160 ed361d9e49ad96e621b7aac8d6cf286d19f70ef4 SHA1 177ba109850f076ef49d792ae02480aea2b50b12 SHA256 a28afe74fa0a99714159884d3ec88db3b752cb6ba34db2e41f8a40ed64cdac4f
 EBUILD gzdoom-1.5.5.ebuild 1853 RMD160 f35342260dd79f9539295abd8d4283f072fea067 SHA1 844f747f21f2d7571d37ca0f0016fd546d846ef1 SHA256 51ab0264a79a9e02077a704bc539c4405960d1c96d1865a828aa13f00b0ac65b
-EBUILD gzdoom-9999.ebuild 1954 RMD160 fbf579592841c5111f4d19ace242830bd6280969 SHA1 38cbb9c4c69bdfc6750943a45304f7f0f074797d SHA256 1c1e88c9744f6b85c1eab8519b90d70244ccd22c72ee2fbbc34d21fdc62dc128
-MISC ChangeLog 2645 RMD160 46dd39e18bc59461649b8c442f2c87ae5f5c1b5e SHA1 4728b4fe634633d699b4432fe1019c8a956c3631 SHA256 f73386289de49362faed7f8226c4c2db6c93939bb5d50805a3fcf2fff07ea9a7
+EBUILD gzdoom-9999.ebuild 1955 RMD160 51e50283927a6d580fa259e45931ab61c70252fe SHA1 bc8ac1ab0896de1778c02b610f17cd48422f52c3 SHA256 c0709ef60b54ddee1b65cd18b761d67c09261099751b51298478367ed4445b31
+MISC ChangeLog 2863 RMD160 ab166e59f563dacb7ac0d08eac706d631728646a SHA1 18eedbc7fa3bb37821d5bfaa3e9b0d70905e2b17 SHA256 1ce08b31f7a239ea25fabb3484a2be1146e1e4a8be19af3ee51145614816620b
 MISC metadata.xml 293 RMD160 93f2f41306368e2ecaf009304527702be3e8dfa7 SHA1 2acf22407b99accddad16d864fa8660334dbc302 SHA256 2fe2749f64960afa7a1e8473fe7c10661c49ba7b047bb931e528bb94ddf757e0
diff --git a/games-fps/gzdoom/files/gzdoom-respect-fluidsynth-useflag.patch b/games-fps/gzdoom/files/gzdoom-respect-fluidsynth-useflag.patch
index 1b3d36d4f..a79f37c7e 100644
--- a/games-fps/gzdoom/files/gzdoom-respect-fluidsynth-useflag.patch
+++ b/games-fps/gzdoom/files/gzdoom-respect-fluidsynth-useflag.patch
@@ -1,37 +1,17 @@
-Override automagic fluidsynth detection.
-
---- FindFluidSynth.cmake
-+++ FindFluidSynth.cmake
-@@ -5,19 +5,19 @@
- #  FLUIDSYNTH_LIBRARIES   - List of libraries when using fluidsynth.
+Index: FindFluidSynth.cmake
+===================================================================
+--- FindFluidSynth.cmake	(revision 1286)
++++ FindFluidSynth.cmake	(working copy)
+@@ -6,6 +6,7 @@
  #  FLUIDSYNTH_FOUND       - True if fluidsynth found.
  
-+IF (USE_FLUIDSYNTH)
-+    IF (FLUIDSYNTH_INCLUDE_DIR AND FLUIDSYNTH_LIBRARIES)
-+    # Already in cache, be silent
-+    SET(FluidSynth_FIND_QUIETLY TRUE)
-+    ENDIF (FLUIDSYNTH_INCLUDE_DIR AND FLUIDSYNTH_LIBRARIES)
  
--IF (FLUIDSYNTH_INCLUDE_DIR AND FLUIDSYNTH_LIBRARIES)
--  # Already in cache, be silent
--  SET(FluidSynth_FIND_QUIETLY TRUE)
--ENDIF (FLUIDSYNTH_INCLUDE_DIR AND FLUIDSYNTH_LIBRARIES)
-+    FIND_PATH(FLUIDSYNTH_INCLUDE_DIR fluidsynth.h)
++IF(USE_FLUIDSYNTH)
+ IF (FLUIDSYNTH_INCLUDE_DIR AND FLUIDSYNTH_LIBRARIES)
+   # Already in cache, be silent
+   SET(FluidSynth_FIND_QUIETLY TRUE)
+@@ -21,3 +22,4 @@
+ INCLUDE(FindPackageHandleStandardArgs)
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(FluidSynth DEFAULT_MSG FLUIDSYNTH_LIBRARIES FLUIDSYNTH_INCLUDE_DIR)
  
--FIND_PATH(FLUIDSYNTH_INCLUDE_DIR fluidsynth.h)
-+    FIND_LIBRARY(FLUIDSYNTH_LIBRARIES NAMES fluidsynth )
-+    MARK_AS_ADVANCED( FLUIDSYNTH_LIBRARIES FLUIDSYNTH_INCLUDE_DIR )
- 
--FIND_LIBRARY(FLUIDSYNTH_LIBRARIES NAMES fluidsynth )
--MARK_AS_ADVANCED( FLUIDSYNTH_LIBRARIES FLUIDSYNTH_INCLUDE_DIR )
--
--# handle the QUIETLY and REQUIRED arguments and set FLUIDSYNTH_FOUND to TRUE if 
--# all listed variables are TRUE
--INCLUDE(FindPackageHandleStandardArgs)
--FIND_PACKAGE_HANDLE_STANDARD_ARGS(FluidSynth DEFAULT_MSG FLUIDSYNTH_LIBRARIES FLUIDSYNTH_INCLUDE_DIR)
--
-+    # handle the QUIETLY and REQUIRED arguments and set FLUIDSYNTH_FOUND to TRUE if
-+    # all listed variables are TRUE
-+    INCLUDE(FindPackageHandleStandardArgs)
-+    FIND_PACKAGE_HANDLE_STANDARD_ARGS(FluidSynth DEFAULT_MSG FLUIDSYNTH_LIBRARIES FLUIDSYNTH_INCLUDE_DIR)
-+ENDIF (USE_FLUIDSYNTH)
++ENDIF(USE_FLUIDSYNTH)
diff --git a/games-fps/gzdoom/gzdoom-9999.ebuild b/games-fps/gzdoom/gzdoom-9999.ebuild
index 02816d6b1..7fb18c27b 100644
--- a/games-fps/gzdoom/gzdoom-9999.ebuild
+++ b/games-fps/gzdoom/gzdoom-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -34,7 +34,7 @@ src_prepare() {
 		-e "s:/usr/local/share/:${GAMES_DATADIR}/doom-data/:" \
 		src/sdl/i_system.h || die
 	epatch "${FILESDIR}/${PN}-respect-fluidsynth-useflag.patch"
-	epatch "${FILESDIR}/${P}-fix-new-fmod.patch"
+#	epatch "${FILESDIR}/${P}-fix-new-fmod.patch"
 }
 
 src_configure() {